Merged with default branch to prepare the 17.04 release. maintenance

Fri, 07 Apr 2017 18:33:59 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 07 Apr 2017 18:33:59 +0200
branch
maintenance
changeset 5680
b93cb6353cc0
parent 5655
884cd9c9ce05 (current diff)
parent 5678
0aa72754d535 (diff)
child 5681
be30320a29bc

Merged with default branch to prepare the 17.04 release.

APIs/Python3/eric6.api file | annotate | diff | comparison | revisions
DebugClients/Python/ThreadExtension.py file | annotate | diff | comparison | revisions
Documentation/Help/source.qch file | annotate | diff | comparison | revisions
Documentation/Help/source.qhp file | annotate | diff | comparison | revisions
Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html file | annotate | diff | comparison | revisions
E5Gui/E5ZoomWidget.py file | annotate | diff | comparison | revisions
E5Network/data/tld_rc.py file | annotate | diff | comparison | revisions
Graphics/UMLGraphicsView.py file | annotate | diff | comparison | revisions
Helpviewer/Bookmarks/DefaultBookmarks_rc.py file | annotate | diff | comparison | revisions
Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py file | annotate | diff | comparison | revisions
Helpviewer/UserAgent/UserAgentDefaults_rc.py file | annotate | diff | comparison | revisions
Helpviewer/data/html_rc.py file | annotate | diff | comparison | revisions
Helpviewer/data/icons_rc.py file | annotate | diff | comparison | revisions
Helpviewer/data/javascript_rc.py file | annotate | diff | comparison | revisions
IconEditor/cursors/cursors_rc.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/CodeStyleChecker/McCabeChecker.py file | annotate | diff | comparison | revisions
Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py file | annotate | diff | comparison | revisions
QScintilla/Editor.py file | annotate | diff | comparison | revisions
QScintilla/Shell.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
WebBrowser/Bookmarks/DefaultBookmarks_rc.py file | annotate | diff | comparison | revisions
WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py file | annotate | diff | comparison | revisions
WebBrowser/UserAgent/UserAgentDefaults_rc.py file | annotate | diff | comparison | revisions
WebBrowser/WebBrowserView.py file | annotate | diff | comparison | revisions
WebBrowser/data/html_rc.py file | annotate | diff | comparison | revisions
WebBrowser/data/icons_rc.py file | annotate | diff | comparison | revisions
WebBrowser/data/javascript_rc.py file | annotate | diff | comparison | revisions
changelog file | annotate | diff | comparison | revisions
--- a/APIs/Python3/eric6.api	Thu Mar 23 18:58:56 2017 +0100
+++ b/APIs/Python3/eric6.api	Fri Apr 07 18:33:59 2017 +0200
@@ -95,7 +95,7 @@
 eric6.DataViews.CodeMetrics.NEWLINE?7
 eric6.DataViews.CodeMetrics.Parser.parse?4(text)
 eric6.DataViews.CodeMetrics.SourceStat.dedent?4(tok)
-eric6.DataViews.CodeMetrics.SourceStat.getCounter?4(id, key)
+eric6.DataViews.CodeMetrics.SourceStat.getCounter?4(counterId, key)
 eric6.DataViews.CodeMetrics.SourceStat.inc?4(key, value=1)
 eric6.DataViews.CodeMetrics.SourceStat.indent?4(tok)
 eric6.DataViews.CodeMetrics.SourceStat.push?4(identifier, row)
@@ -179,10 +179,12 @@
 eric6.DebugClients.Python.DebugBase.DebugBase.getStack?4(frame=None, applyTrace=False)
 eric6.DebugClients.Python.DebugBase.DebugBase.go?4(special)
 eric6.DebugClients.Python.DebugBase.DebugBase.lib?7
+eric6.DebugClients.Python.DebugBase.DebugBase.move_instruction_pointer?4(lineno)
 eric6.DebugClients.Python.DebugBase.DebugBase.pathsToSkip?7
+eric6.DebugClients.Python.DebugBase.DebugBase.pollTimerEnabled?7
 eric6.DebugClients.Python.DebugBase.DebugBase.profile?4(frame, event, arg)
 eric6.DebugClients.Python.DebugBase.DebugBase.profileWithRecursion?4(frame, event, arg)
-eric6.DebugClients.Python.DebugBase.DebugBase.run?4(cmd, globals=None, locals=None, debug=True)
+eric6.DebugClients.Python.DebugBase.DebugBase.run?4(cmd, globalsDict=None, localsDict=None, debug=True)
 eric6.DebugClients.Python.DebugBase.DebugBase.setRecursionDepth?4(frame)
 eric6.DebugClients.Python.DebugBase.DebugBase.set_continue?4(special)
 eric6.DebugClients.Python.DebugBase.DebugBase.set_next?4(frame)
@@ -230,7 +232,7 @@
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendPassiveStartup?4(filename, exceptions)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendResponseLine?4(stack)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sendSyntaxError?4(message, filename, lineno, charno)
-eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(exit=True)
+eric6.DebugClients.Python.DebugClientBase.DebugClientBase.sessionClose?4(terminate=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.startDebugger?4(filename=None, host=None, port=None, enableTrace=True, exceptions=True, tracePython=False, redirect=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.startProgInDebugger?4(progargs, wd='', host=None, port=None, exceptions=True, tracePython=False, redirect=True)
 eric6.DebugClients.Python.DebugClientBase.DebugClientBase.writeReady?4(stream)
@@ -252,7 +254,7 @@
 eric6.DebugClients.Python.DebugConfig.ConfigVarTypeStrings?7
 eric6.DebugClients.Python.DebugUtilities.ArgInfo?7
 eric6.DebugClients.Python.DebugUtilities._getfullargs?5(co)
-eric6.DebugClients.Python.DebugUtilities.formatargvalues?4(args, varargs, varkw, locals, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value))
+eric6.DebugClients.Python.DebugUtilities.formatargvalues?4(args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value))
 eric6.DebugClients.Python.DebugUtilities.getargvalues?4(frame)
 eric6.DebugClients.Python.DebugUtilities.prepareJsonCommand?4(method, params)
 eric6.DebugClients.Python.DebugVariables.ArrayResolver.TypeCodeMap?7
@@ -302,13 +304,13 @@
 eric6.DebugClients.Python.ThreadExtension.QThreadWrapper?1(*args, **kwargs)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension._bootstrap?5(run)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension._bootstrapQThread?5(run)
-eric6.DebugClients.Python.ThreadExtension.ThreadExtension.attachThread?4(target=None, args=None, kwargs={}, mainThread=False)
+eric6.DebugClients.Python.ThreadExtension.ThreadExtension.attachThread?4(target=None, args=None, kwargs=None, mainThread=False)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.dumpThreadList?4()
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.find_module?4(fullname, path=None)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.getExecutedFrame?4(frame)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.load_module?4(fullname)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.lockClient?4(blocking=True)
-eric6.DebugClients.Python.ThreadExtension.ThreadExtension.setCurrentThread?4(id)
+eric6.DebugClients.Python.ThreadExtension.ThreadExtension.setCurrentThread?4(threadId)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.threadTerminated?4(threadId)
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.unlockClient?4()
 eric6.DebugClients.Python.ThreadExtension.ThreadExtension.updateThreadList?4()
@@ -328,7 +330,7 @@
 eric6.DebugClients.Python.getpass.unix_getpass?7
 eric6.DebugClients.Python.getpass.win_getpass?7
 eric6.Debugger.BreakPointModel.BreakPointModel.addBreakPoint?4(fn, line, properties)
-eric6.Debugger.BreakPointModel.BreakPointModel.columnCount?4(parent=QModelIndex())
+eric6.Debugger.BreakPointModel.BreakPointModel.columnCount?4(parent=None)
 eric6.Debugger.BreakPointModel.BreakPointModel.data?4(index, role=Qt.DisplayRole)
 eric6.Debugger.BreakPointModel.BreakPointModel.dataAboutToBeChanged?7
 eric6.Debugger.BreakPointModel.BreakPointModel.deleteAll?4()
@@ -337,12 +339,12 @@
 eric6.Debugger.BreakPointModel.BreakPointModel.flags?4(index)
 eric6.Debugger.BreakPointModel.BreakPointModel.getBreakPointByIndex?4(index)
 eric6.Debugger.BreakPointModel.BreakPointModel.getBreakPointIndex?4(fn, lineno)
-eric6.Debugger.BreakPointModel.BreakPointModel.hasChildren?4(parent=QModelIndex())
+eric6.Debugger.BreakPointModel.BreakPointModel.hasChildren?4(parent=None)
 eric6.Debugger.BreakPointModel.BreakPointModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Debugger.BreakPointModel.BreakPointModel.index?4(row, column, parent=QModelIndex())
+eric6.Debugger.BreakPointModel.BreakPointModel.index?4(row, column, parent=None)
 eric6.Debugger.BreakPointModel.BreakPointModel.isBreakPointTemporaryByIndex?4(index)
 eric6.Debugger.BreakPointModel.BreakPointModel.parent?4(index)
-eric6.Debugger.BreakPointModel.BreakPointModel.rowCount?4(parent=QModelIndex())
+eric6.Debugger.BreakPointModel.BreakPointModel.rowCount?4(parent=None)
 eric6.Debugger.BreakPointModel.BreakPointModel.setBreakPointByIndex?4(index, fn, line, properties)
 eric6.Debugger.BreakPointModel.BreakPointModel.setBreakPointEnabledByIndex?4(index, enabled)
 eric6.Debugger.BreakPointModel.BreakPointModel.setData?4(index, value, role=Qt.EditRole)
@@ -409,16 +411,16 @@
 eric6.Debugger.DebugServer.DebugServer.clientUtPrepared?4(result, exceptionType, exceptionValue)
 eric6.Debugger.DebugServer.DebugServer.clientUtStartTest?4(testname, doc)
 eric6.Debugger.DebugServer.DebugServer.clientUtStopTest?4()
-eric6.Debugger.DebugServer.DebugServer.clientUtTestErrored?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestFailed?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestFailedExpected?4(testname, traceback, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestSkipped?4(testname, reason, id)
-eric6.Debugger.DebugServer.DebugServer.clientUtTestSucceededUnexpected?4(testname, id)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestErrored?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestFailed?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestFailedExpected?4(testname, traceback, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestSkipped?4(testname, reason, testId)
+eric6.Debugger.DebugServer.DebugServer.clientUtTestSucceededUnexpected?4(testname, testId)
 eric6.Debugger.DebugServer.DebugServer.clientVariable?7
 eric6.Debugger.DebugServer.DebugServer.clientVariables?7
 eric6.Debugger.DebugServer.DebugServer.clientWatchConditionError?7
 eric6.Debugger.DebugServer.DebugServer.getBreakPointModel?4()
-eric6.Debugger.DebugServer.DebugServer.getClientCapabilities?4(type)
+eric6.Debugger.DebugServer.DebugServer.getClientCapabilities?4(clientType)
 eric6.Debugger.DebugServer.DebugServer.getClientInterpreter?4()
 eric6.Debugger.DebugServer.DebugServer.getExtensions?4(language)
 eric6.Debugger.DebugServer.DebugServer.getHostAddress?4(localhost)
@@ -430,16 +432,17 @@
 eric6.Debugger.DebugServer.DebugServer.preferencesChanged?4()
 eric6.Debugger.DebugServer.DebugServer.registerDebuggerInterface?4(name, getRegistryData)
 eric6.Debugger.DebugServer.DebugServer.remoteBanner?4()
-eric6.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, set, cond=None, temp=False)
+eric6.Debugger.DebugServer.DebugServer.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
 eric6.Debugger.DebugServer.DebugServer.remoteCapabilities?4()
-eric6.Debugger.DebugServer.DebugServer.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebugServer.DebugServer.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebugServer.DebugServer.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebugServer.DebugServer.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebugServer.DebugServer.remoteCompletion?4(text)
 eric6.Debugger.DebugServer.DebugServer.remoteContinue?4(special=False)
 eric6.Debugger.DebugServer.DebugServer.remoteCoverage?4(fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
 eric6.Debugger.DebugServer.DebugServer.remoteEnvironment?4(env)
 eric6.Debugger.DebugServer.DebugServer.remoteLoad?4(fn, argv, wd, env, autoClearShell=True, tracePython=False, autoContinue=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="", enableCallTrace=False)
+eric6.Debugger.DebugServer.DebugServer.remoteMoveIP?4(line)
 eric6.Debugger.DebugServer.DebugServer.remoteProfile?4(fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType="")
 eric6.Debugger.DebugServer.DebugServer.remoteRawInput?4(s)
 eric6.Debugger.DebugServer.DebugServer.remoteRun?4(fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="")
@@ -532,9 +535,9 @@
 eric6.Debugger.DebugViewer.DebugViewer.setLocalsFilter?4()
 eric6.Debugger.DebugViewer.DebugViewer.setVariablesFilter?4(globalsFilter, localsFilter)
 eric6.Debugger.DebugViewer.DebugViewer.showThreadList?4(currentID, threadList)
-eric6.Debugger.DebugViewer.DebugViewer.showVariable?4(vlist, globals)
-eric6.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, globals)
-eric6.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(globals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariable?4(vlist, showGlobals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariables?4(vlist, showGlobals)
+eric6.Debugger.DebugViewer.DebugViewer.showVariablesTab?4(showGlobals)
 eric6.Debugger.DebugViewer.DebugViewer.sourceFile?7
 eric6.Debugger.DebugViewer.DebugViewer?1(debugServer, docked, vm, parent=None, embeddedShell=True, embeddedBrowser=True)
 eric6.Debugger.DebuggerInterfaceNone.ClientDefaultCapabilities?7
@@ -543,19 +546,20 @@
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.getClientCapabilities?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.isConnected?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.newConnection?4(sock)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, set, cond=None, temp=False)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpoint?4(fn, line, setBreakpoint, cond=None, temp=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteCoverage?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteEnvironment?4(env)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteEval?4(arg)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteMoveIP?4(line)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteProfile?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteRawInput?4(s)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False)
@@ -569,7 +573,7 @@
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTPrepare?4(fn, tn, tfn, failed, cov, covname, coverase)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTRun?4()
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteUTStop?4()
-eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, set, temp=False)
+eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpoint?4(cond, setWatch, temp=False)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointEnable?4(cond, enable)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointIgnore?4(cond, count)
 eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.setCallTraceEnabled?4(on)
@@ -589,14 +593,15 @@
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteCoverage?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteEnvironment?4(env)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteMoveIP?4(line)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteProfile?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteRawInput?4(s)
 eric6.Debugger.DebuggerInterfacePython2.DebuggerInterfacePython2.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False)
@@ -630,14 +635,15 @@
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointEnable?4(fn, line, enable)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteBreakpointIgnore?4(fn, line, count)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCapabilities?4()
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientSetFilter?4(scope, filter)
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filter, var, framenr=0)
-eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filter, framenr=0)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientSetFilter?4(scope, filterStr)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariable?4(scope, filterList, var, framenr=0)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteClientVariables?4(scope, filterList, framenr=0)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCompletion?4(text)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteContinue?4(special=False)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteCoverage?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteEnvironment?4(env)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteLoad?4(fn, argv, wd, traceInterpreter=False, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteMoveIP?4(line)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteProfile?4(fn, argv, wd, erase=False)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteRawInput?4(s)
 eric6.Debugger.DebuggerInterfacePython3.DebuggerInterfacePython3.remoteRun?4(fn, argv, wd, autoFork=False, forkChild=False)
@@ -664,7 +670,7 @@
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.getAddData?4()
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.getData?4()
 eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog.on_filenamePicker_editTextChanged?4(fn)
-eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None)
+eric6.Debugger.EditBreakpointDialog.EditBreakpointDialog?1(breakPointId, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None)
 eric6.Debugger.EditWatchpointDialog.EditWatchpointDialog.getData?4()
 eric6.Debugger.EditWatchpointDialog.EditWatchpointDialog?1(properties, parent=None, name=None, modal=False)
 eric6.Debugger.ExceptionLogger.ExceptionLogger.addException?4(exceptionType, exceptionMessage, stackTrace)
@@ -688,7 +694,7 @@
 eric6.Debugger.StartDialog.StartDialog.historiesModified?4()
 eric6.Debugger.StartDialog.StartDialog.on_buttonBox_clicked?4(button)
 eric6.Debugger.StartDialog.StartDialog.on_modFuncCombo_editTextChanged?4()
-eric6.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
+eric6.Debugger.StartDialog.StartDialog?1(caption, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False)
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.getHistory?4()
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteAllButton_clicked?4()
 eric6.Debugger.StartHistoryEditDialog.StartHistoryEditDialog.on_deleteButton_clicked?4()
@@ -725,7 +731,7 @@
 eric6.Debugger.VariablesViewer.VariablesViewer.showVariables?4(vlist, frmnr)
 eric6.Debugger.VariablesViewer.VariablesViewer?1(viewer, globalScope, parent=None)
 eric6.Debugger.WatchPointModel.WatchPointModel.addWatchPoint?4(cond, special, properties)
-eric6.Debugger.WatchPointModel.WatchPointModel.columnCount?4(parent=QModelIndex())
+eric6.Debugger.WatchPointModel.WatchPointModel.columnCount?4(parent=None)
 eric6.Debugger.WatchPointModel.WatchPointModel.data?4(index, role)
 eric6.Debugger.WatchPointModel.WatchPointModel.dataAboutToBeChanged?7
 eric6.Debugger.WatchPointModel.WatchPointModel.deleteAll?4()
@@ -734,11 +740,11 @@
 eric6.Debugger.WatchPointModel.WatchPointModel.flags?4(index)
 eric6.Debugger.WatchPointModel.WatchPointModel.getWatchPointByIndex?4(index)
 eric6.Debugger.WatchPointModel.WatchPointModel.getWatchPointIndex?4(cond, special="")
-eric6.Debugger.WatchPointModel.WatchPointModel.hasChildren?4(parent=QModelIndex())
+eric6.Debugger.WatchPointModel.WatchPointModel.hasChildren?4(parent=None)
 eric6.Debugger.WatchPointModel.WatchPointModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Debugger.WatchPointModel.WatchPointModel.index?4(row, column, parent=QModelIndex())
+eric6.Debugger.WatchPointModel.WatchPointModel.index?4(row, column, parent=None)
 eric6.Debugger.WatchPointModel.WatchPointModel.parent?4(index)
-eric6.Debugger.WatchPointModel.WatchPointModel.rowCount?4(parent=QModelIndex())
+eric6.Debugger.WatchPointModel.WatchPointModel.rowCount?4(parent=None)
 eric6.Debugger.WatchPointModel.WatchPointModel.setWatchPointByIndex?4(index, cond, special, properties)
 eric6.Debugger.WatchPointModel.WatchPointModel.setWatchPointEnabledByIndex?4(index, enabled)
 eric6.Debugger.WatchPointModel.WatchPointModel?1(parent=None)
@@ -851,7 +857,7 @@
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setEndPoint?4(x, y)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setPoints?4(xa, ya, xb, yb)
 eric6.E5Graphics.E5ArrowItem.E5ArrowItem.setStartPoint?4(x, y)
-eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None)
+eric6.E5Graphics.E5ArrowItem.E5ArrowItem?1(origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None)
 eric6.E5Graphics.E5ArrowItem.NormalArrow?7
 eric6.E5Graphics.E5ArrowItem.WideArrow?7
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.ZoomLevelDefault?7
@@ -862,7 +868,7 @@
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.filteredItems?4(items)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.printDiagram?4(printer, diagramName="")
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.resizeScene?4(amount, isWidth=True)
-eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, format="PNG")
+eric6.E5Graphics.E5GraphicsView.E5GraphicsView.saveImage?4(filename, imageFormat="PNG")
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.setSceneSize?4(width, height)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.setZoom?4(value)
 eric6.E5Graphics.E5GraphicsView.E5GraphicsView.zoom?4()
@@ -891,8 +897,8 @@
 eric6.E5Gui.E5Application.E5Application.getPluginObject?4(name)
 eric6.E5Gui.E5Application.E5Application.getPluginObjectType?4(name)
 eric6.E5Gui.E5Application.E5Application.getPluginObjects?4()
-eric6.E5Gui.E5Application.E5Application.registerObject?4(name, object)
-eric6.E5Gui.E5Application.E5Application.registerPluginObject?4(name, object, pluginType=None)
+eric6.E5Gui.E5Application.E5Application.registerObject?4(name, objectRef)
+eric6.E5Gui.E5Application.E5Application.registerPluginObject?4(name, objectRef, pluginType=None)
 eric6.E5Gui.E5Application.E5Application.unregisterPluginObject?4(name)
 eric6.E5Gui.E5Application.E5Application?1(argv)
 eric6.E5Gui.E5Application.e5App?7
@@ -910,7 +916,7 @@
 eric6.E5Gui.E5Completers.E5FileCompleter.rootPath?4()
 eric6.E5Gui.E5Completers.E5FileCompleter.setRootPath?4(path)
 eric6.E5Gui.E5Completers.E5FileCompleter?1(parent=None, completionMode=QCompleter.PopupCompletion, showHidden=False)
-eric6.E5Gui.E5Completers.E5StringListCompleter?1(parent=None, strings=[], completionMode=QCompleter.PopupCompletion)
+eric6.E5Gui.E5Completers.E5StringListCompleter?1(parent=None, strings=None, completionMode=QCompleter.PopupCompletion)
 eric6.E5Gui.E5ErrorMessage.E5ErrorMessage.editMessageFilters?4()
 eric6.E5Gui.E5ErrorMessage.E5ErrorMessage.showMessage?4(message, msgType="")
 eric6.E5Gui.E5ErrorMessage.E5ErrorMessage?1(parent=None)
@@ -930,12 +936,12 @@
 eric6.E5Gui.E5FileDialog.ReadOnly?7
 eric6.E5Gui.E5FileDialog.ShowDirsOnly?7
 eric6.E5Gui.E5FileDialog.getExistingDirectory?4(parent=None, caption="", directory="", options=QFileDialog.ShowDirsOnly)
-eric6.E5Gui.E5FileDialog.getOpenFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNames?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filter="", options=QFileDialog.Options())
-eric6.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options())
+eric6.E5Gui.E5FileDialog.getOpenFileName?4(parent=None, caption="", directory="", filterStr="", options=None)
+eric6.E5Gui.E5FileDialog.getOpenFileNameAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=None)
+eric6.E5Gui.E5FileDialog.getOpenFileNames?4(parent=None, caption="", directory="", filterStr="", options=None)
+eric6.E5Gui.E5FileDialog.getOpenFileNamesAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=None)
+eric6.E5Gui.E5FileDialog.getSaveFileName?4(parent=None, caption="", directory="", filterStr="", options=None)
+eric6.E5Gui.E5FileDialog.getSaveFileNameAndFilter?4(parent=None, caption="", directory="", filterStr="", initialFilter="", options=None)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.createRules?4(*rules)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.formats?4(line)
 eric6.E5Gui.E5GenericDiffHighlighter.E5GenericDiffHighlighter.generateRules?4()
@@ -1032,7 +1038,7 @@
 eric6.E5Gui.E5MessageBox.Critical?7
 eric6.E5Gui.E5MessageBox.DestructiveRole?7
 eric6.E5Gui.E5MessageBox.Discard?7
-eric6.E5Gui.E5MessageBox.E5MessageBox?1(icon, title, text, modal=False, buttons=QMessageBox.StandardButtons(QMessageBox.NoButton), parent=None)
+eric6.E5Gui.E5MessageBox.E5MessageBox?1(icon, title, text, modal=False, buttons=QMessageBox.NoButton, parent=None)
 eric6.E5Gui.E5MessageBox.Help?7
 eric6.E5Gui.E5MessageBox.HelpRole?7
 eric6.E5Gui.E5MessageBox.Ignore?7
@@ -1190,8 +1196,8 @@
 eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileMode?7
 eric6.E5Gui.E5PathPicker.E5PathPickerModes.SaveFileOverwriteMode?7
 eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.format?4()
-eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(format)
-eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, format=None, parent=None, flags=Qt.WindowFlags())
+eric6.E5Gui.E5ProgressDialog.E5ProgressDialog.setFormat?4(labelFormat)
+eric6.E5Gui.E5ProgressDialog.E5ProgressDialog?1(labelText, cancelButtonText, minimum, maximum, labelFormat=None, parent=None, flags=None)
 eric6.E5Gui.E5SideBar.E5SideBar.East?7
 eric6.E5Gui.E5SideBar.E5SideBar.North?7
 eric6.E5Gui.E5SideBar.E5SideBar.South?7
@@ -1349,7 +1355,7 @@
 eric6.E5Gui.E5ToolBox.E5HorizontalToolBox?1(parent=None)
 eric6.E5Gui.E5ToolBox.E5VerticalToolBox?1(parent=None)
 eric6.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.filterAcceptsRow?4(sourceRow, sourceParent)
-eric6.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.hasChildren?4(parent=QModelIndex())
+eric6.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel.hasChildren?4(parent=None)
 eric6.E5Gui.E5TreeSortFilterProxyModel.E5TreeSortFilterProxyModel?1(parent=None)
 eric6.E5Gui.E5TreeView.E5TreeView.keyPressEvent?4(evt)
 eric6.E5Gui.E5TreeView.E5TreeView.removeAll?4()
@@ -1363,7 +1369,7 @@
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.clear?4()
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.deleteItem?4(item)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.deleteItems?4(items)
-eric6.E5Gui.E5TreeWidget.E5TreeWidget.filterString?4(filter)
+eric6.E5Gui.E5TreeWidget.E5TreeWidget.filterString?4(filterStr)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.insertTopLevelItem?4(index, item)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.insertTopLevelItems?4(index, items)
 eric6.E5Gui.E5TreeWidget.E5TreeWidget.itemControlClicked?7
@@ -1628,7 +1634,7 @@
 eric6.E5XML.XMLStreamWriterBase.XMLStreamWriterBase.writeBasics?4(tag, pyobject)
 eric6.E5XML.XMLStreamWriterBase.XMLStreamWriterBase.writeXML?4()
 eric6.E5XML.XMLStreamWriterBase.XMLStreamWriterBase?1(device)
-eric6.Globals.AppInfo.makeAppInfo?4(argv, name, arg, description, options=[])
+eric6.Globals.AppInfo.makeAppInfo?4(argv, name, arg, description, options=None)
 eric6.Globals.E5ConfigParser.E5ConfigParser.OPTCRE?7
 eric6.Globals.E5ConfigParser.E5ConfigParser.OPTCRE_NV?7
 eric6.Globals.E5ConfigParser.E5ConfigParser._OPT_NV_TMPL?8
@@ -1646,7 +1652,7 @@
 eric6.Globals.compatibility_fixes.find_moduleAsStr?4(*args)
 eric6.Globals.compatibility_fixes.joinAsUnicode?4(*args)
 eric6.Globals.compatibility_fixes.load_sourceAsStr?4(*args)
-eric6.Globals.compatibility_fixes.open?4(file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True)
+eric6.Globals.compatibility_fixes.open?4(filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True)
 eric6.Globals.configDir?7
 eric6.Globals.findPythonInterpreters?4(pyVersion)
 eric6.Globals.getConfigDir?4()
@@ -1679,7 +1685,7 @@
 eric6.Graphics.AssociationItem.AssociationItem.parseAssociationItemDataString?4(data)
 eric6.Graphics.AssociationItem.AssociationItem.unassociate?4()
 eric6.Graphics.AssociationItem.AssociationItem.widgetMoved?4()
-eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, type=Normal, topToBottom=False, parent=None)
+eric6.Graphics.AssociationItem.AssociationItem?1(itemA, itemB, assocType=Normal, topToBottom=False, parent=None)
 eric6.Graphics.AssociationItem.Center?7
 eric6.Graphics.AssociationItem.East?7
 eric6.Graphics.AssociationItem.Generalisation?7
@@ -1704,7 +1710,7 @@
 eric6.Graphics.ClassItem.ClassModel.addMethod?4(method)
 eric6.Graphics.ClassItem.ClassModel.getAttributes?4()
 eric6.Graphics.ClassItem.ClassModel.getMethods?4()
-eric6.Graphics.ClassItem.ClassModel?1(name, methods=[], attributes=[])
+eric6.Graphics.ClassItem.ClassModel?1(name, methods=None, attributes=None)
 eric6.Graphics.GraphicsUtilities._buildChildrenLists?5(routes)
 eric6.Graphics.GraphicsUtilities.sort?4(nodes, routes, noRecursion=False)
 eric6.Graphics.ImportsDiagramBuilder.ImportsDiagramBuilder.buildDiagram?4()
@@ -1720,7 +1726,7 @@
 eric6.Graphics.ModuleItem.ModuleItem?1(model=None, x=0, y=0, rounded=False, parent=None, scene=None)
 eric6.Graphics.ModuleItem.ModuleModel.addClass?4(classname)
 eric6.Graphics.ModuleItem.ModuleModel.getClasses?4()
-eric6.Graphics.ModuleItem.ModuleModel?1(name, classlist=[])
+eric6.Graphics.ModuleItem.ModuleModel?1(name, classlist=None)
 eric6.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.buildDiagram?4()
 eric6.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.getPersistenceData?4()
 eric6.Graphics.PackageDiagramBuilder.PackageDiagramBuilder.initialize?4()
@@ -1734,7 +1740,7 @@
 eric6.Graphics.PackageItem.PackageItem?1(model=None, x=0, y=0, rounded=False, noModules=False, parent=None, scene=None)
 eric6.Graphics.PackageItem.PackageModel.addModule?4(modulename)
 eric6.Graphics.PackageItem.PackageModel.getModules?4()
-eric6.Graphics.PackageItem.PackageModel?1(name, moduleslist=[])
+eric6.Graphics.PackageItem.PackageModel?1(name, moduleslist=None)
 eric6.Graphics.PixmapDiagram.PixmapDiagram.ZoomLevelDefault?7
 eric6.Graphics.PixmapDiagram.PixmapDiagram.ZoomLevels?7
 eric6.Graphics.PixmapDiagram.PixmapDiagram.event?4(evt)
@@ -1772,7 +1778,7 @@
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.autoAdjustSceneSize?4(limit=False)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.event?4(evt)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.filteredItems?4(items, itemType=UMLItem)
-eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItem?4(id)
+eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItem?4(itemId)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.findItemByName?4(name)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.gestureEvent?4(evt)
 eric6.Graphics.UMLGraphicsView.UMLGraphicsView.getItemId?4()
@@ -1802,7 +1808,7 @@
 eric6.Graphics.UMLItem.UMLItem.parseItemDataString?4(version, data)
 eric6.Graphics.UMLItem.UMLItem.removeAssociation?4(assoc)
 eric6.Graphics.UMLItem.UMLItem.removeAssociations?4()
-eric6.Graphics.UMLItem.UMLItem.setId?4(id)
+eric6.Graphics.UMLItem.UMLItem.setId?4(itemId)
 eric6.Graphics.UMLItem.UMLItem.setPos?4(x, y)
 eric6.Graphics.UMLItem.UMLItem.setSize?4(width, height)
 eric6.Graphics.UMLItem.UMLItem?1(model=None, x=0, y=0, rounded=False, parent=None)
@@ -1814,10 +1820,10 @@
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.abort?4()
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply.readData?4(maxlen)
 eric6.Helpviewer.AdBlock.AdBlockBlockedNetworkReply.AdBlockBlockedNetworkReply?1(request, subscription, rule, parent=None)
-eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
-eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_subscriptionsTabWidget_currentChanged?4(index)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value)
 eric6.Helpviewer.AdBlock.AdBlockDialog.AdBlockDialog.showRule?4(rule)
@@ -1887,10 +1893,10 @@
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
-eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter)
+eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filterRule)
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.subscription?4()
 eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
-eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filter="", subscription=None)
+eric6.Helpviewer.AdBlock.AdBlockRule.AdBlockRule?1(filterRule="", subscription=None)
 eric6.Helpviewer.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
@@ -1922,7 +1928,7 @@
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
 eric6.Helpviewer.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, custom, parent=None, default=False)
-eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filter="")
+eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filterRule="")
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.keyPressEvent?4(evt)
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.refresh?4()
 eric6.Helpviewer.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.removeRule?4()
@@ -1945,7 +1951,7 @@
 eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.columnCount?4(parent)
 eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsColumn?4(sourceColumn, sourceParent)
 eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsRow?4(sourceRow, sourceParent)
-eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent=QModelIndex())
+eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent=None)
 eric6.Helpviewer.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel?1(parent=None)
 eric6.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Bookmark?7
 eric6.Helpviewer.Bookmarks.BookmarkNode.BookmarkNode.Folder?7
@@ -1980,44 +1986,44 @@
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(id="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(sourceId="", parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.importedBookmarks?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.open?4()
 eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.setPath?4(path)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(id="", parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(id)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporter?4(id, parent=None)
-eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporterInfo?4(id)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(sourceId="", parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(sourceId)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporter?4(sourceId, parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporterInfo?4(sourceId)
 eric6.Helpviewer.Bookmarks.BookmarksImporters.getImporters?4()
 eric6.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKBAR?7
 eric6.Helpviewer.Bookmarks.BookmarksManager.BOOKMARKMENU?7
@@ -2078,23 +2084,23 @@
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.UrlRole?7
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.UrlStringRole?7
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.bookmarksManager?4()
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.data?4(index, role=Qt.DisplayRole)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.dropMimeData?4(data, action, row, column, parent)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryAdded?4(node)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryChanged?4(node)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.entryRemoved?4(parent, row, node)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.flags?4(index)
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent=QModelIndex())
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent=QModelIndex())
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.mimeData?4(indexes)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.mimeTypes?4()
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.node?4(index)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.nodeIndex?4(node)
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index=QModelIndex())
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index=None)
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent=None)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.setData?4(index, value, role=Qt.EditRole)
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel.supportedDropActions?4()
 eric6.Helpviewer.Bookmarks.BookmarksModel.BookmarksModel?1(manager, parent=None)
@@ -2118,7 +2124,7 @@
 eric6.Helpviewer.Bookmarks.XbelReader.XmlEntityResolver.resolveUndeclaredEntity?4(entity)
 eric6.Helpviewer.Bookmarks.XbelWriter.XbelWriter.write?4(fileNameOrDevice, root)
 eric6.Helpviewer.Bookmarks.XbelWriter.XbelWriter?1()
-eric6.Helpviewer.ClosedTabsManager.ClosedTab?1(url=QUrl(), title="", position=-1)
+eric6.Helpviewer.ClosedTabsManager.ClosedTab?1(url=None, title="", position=-1)
 eric6.Helpviewer.ClosedTabsManager.ClosedTabsManager.allClosedTabs?4()
 eric6.Helpviewer.ClosedTabsManager.ClosedTabsManager.clearList?4()
 eric6.Helpviewer.ClosedTabsManager.ClosedTabsManager.closedTabAvailable?7
@@ -2129,11 +2135,11 @@
 eric6.Helpviewer.CookieJar.CookieDetailsDialog.CookieDetailsDialog.setData?4(domain, name, path, secure, expires, value)
 eric6.Helpviewer.CookieJar.CookieDetailsDialog.CookieDetailsDialog?1(parent=None)
 eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.addRule?4(host, rule)
-eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=None)
 eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.data?4(index, role)
 eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.headerData?4(section, orientation, role)
-eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent=None)
 eric6.Helpviewer.CookieJar.CookieExceptionsModel.CookieExceptionsModel?1(cookieJar, parent=None)
 eric6.Helpviewer.CookieJar.CookieJar.CookieJar.AcceptAlways?7
 eric6.Helpviewer.CookieJar.CookieJar.CookieJar.AcceptNever?7
@@ -2169,11 +2175,11 @@
 eric6.Helpviewer.CookieJar.CookieJar.CookieJar.setFilterTrackingCookies?4(filterTrackingCookies)
 eric6.Helpviewer.CookieJar.CookieJar.CookieJar.setKeepPolicy?4(policy)
 eric6.Helpviewer.CookieJar.CookieJar.CookieJar?1(parent=None)
-eric6.Helpviewer.CookieJar.CookieModel.CookieModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.CookieJar.CookieModel.CookieModel.columnCount?4(parent=None)
 eric6.Helpviewer.CookieJar.CookieModel.CookieModel.data?4(index, role)
 eric6.Helpviewer.CookieJar.CookieModel.CookieModel.headerData?4(section, orientation, role)
-eric6.Helpviewer.CookieJar.CookieModel.CookieModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.CookieJar.CookieModel.CookieModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.CookieJar.CookieModel.CookieModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.CookieJar.CookieModel.CookieModel.rowCount?4(parent=None)
 eric6.Helpviewer.CookieJar.CookieModel.CookieModel?1(cookieJar, parent=None)
 eric6.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.accept?4()
 eric6.Helpviewer.CookieJar.CookiesConfigurationDialog.CookiesConfigurationDialog.on_cookiesButton_clicked?4()
@@ -2241,8 +2247,8 @@
 eric6.Helpviewer.Download.DownloadModel.DownloadModel.data?4(index, role)
 eric6.Helpviewer.Download.DownloadModel.DownloadModel.flags?4(index)
 eric6.Helpviewer.Download.DownloadModel.DownloadModel.mimeData?4(indexes)
-eric6.Helpviewer.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.Download.DownloadModel.DownloadModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.Download.DownloadModel.DownloadModel.rowCount?4(parent=None)
 eric6.Helpviewer.Download.DownloadModel.DownloadModel?1(manager, parent=None)
 eric6.Helpviewer.Download.DownloadUtilities.dataString?4(size)
 eric6.Helpviewer.Download.DownloadUtilities.timeString?4(timeRemaining)
@@ -2297,7 +2303,7 @@
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_addWhiteButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_blackList_itemSelectionChanged?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_cookiesList_currentItemChanged?4(current, previous)
-eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filter)
+eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filterStr)
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_reloadButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeAllButton_clicked?4()
 eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeBlackButton_clicked?4()
@@ -2662,18 +2668,18 @@
 eric6.Helpviewer.History.HistoryFilterModel.HistoryData?1(offset, frequency=0)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.FrequencyRole?7
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.MaxRole?7
-eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent=None)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.data?4(index, role=Qt.DisplayRole)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.headerData?4(section, orientation, role=Qt.DisplayRole)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.historyContains?4(url)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.historyLocation?4(url)
-eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent=QModelIndex())
+eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent=None)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.mapFromSource?4(sourceIndex)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.mapToSource?4(proxyIndex)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.parent?4(index)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.recalculateFrequencies?4()
-eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent=None)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel.setSourceModel?4(sourceModel)
 eric6.Helpviewer.History.HistoryFilterModel.HistoryFilterModel?1(sourceModel, parent=None)
 eric6.Helpviewer.History.HistoryManager.HISTORY_VERSION?7
@@ -2713,13 +2719,13 @@
 eric6.Helpviewer.History.HistoryMenu.HistoryMenu?1(parent=None, tabWidget=None)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.MOVEDROWS?7
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.bumpedRows?4()
-eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent=QModelIndex())
-eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent=QModelIndex())
+eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent=None)
+eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent=None)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.mapFromSource?4(sourceIndex)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.mapToSource?4(proxyIndex)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.mimeData?4(indexes)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.parent?4(index)
-eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent=None)
 eric6.Helpviewer.History.HistoryMenu.HistoryMenuModel?1(sourceModel, parent=None)
 eric6.Helpviewer.History.HistoryMenu.HistoryMostVisitedMenu.newUrl?7
 eric6.Helpviewer.History.HistoryMenu.HistoryMostVisitedMenu.openUrl?7
@@ -2733,26 +2739,26 @@
 eric6.Helpviewer.History.HistoryModel.HistoryModel.TitleRole?7
 eric6.Helpviewer.History.HistoryModel.HistoryModel.UrlRole?7
 eric6.Helpviewer.History.HistoryModel.HistoryModel.UrlStringRole?7
-eric6.Helpviewer.History.HistoryModel.HistoryModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryModel.HistoryModel.columnCount?4(parent=None)
 eric6.Helpviewer.History.HistoryModel.HistoryModel.data?4(index, role=Qt.DisplayRole)
 eric6.Helpviewer.History.HistoryModel.HistoryModel.entryAdded?4()
 eric6.Helpviewer.History.HistoryModel.HistoryModel.entryUpdated?4(row)
 eric6.Helpviewer.History.HistoryModel.HistoryModel.headerData?4(section, orientation, role=Qt.DisplayRole)
 eric6.Helpviewer.History.HistoryModel.HistoryModel.historyReset?4()
-eric6.Helpviewer.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.History.HistoryModel.HistoryModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.History.HistoryModel.HistoryModel.rowCount?4(parent=None)
 eric6.Helpviewer.History.HistoryModel.HistoryModel?1(historyManager, parent=None)
-eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent=None)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.data?4(index, role=Qt.DisplayRole)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.flags?4(index)
-eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent=None)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent=QModelIndex())
+eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent=None)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.mapFromSource?4(sourceIndex)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.mapToSource?4(proxyIndex)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.parent?4(index)
-eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent=None)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel.setSourceModel?4(sourceModel)
 eric6.Helpviewer.History.HistoryTreeModel.HistoryTreeModel?1(sourceModel, parent=None)
 eric6.Helpviewer.JavaScriptResources.parseForms_js?7
@@ -2828,14 +2834,14 @@
 eric6.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog.storeData?4()
 eric6.Helpviewer.OfflineStorage.OfflineStorageConfigDialog.OfflineStorageConfigDialog?1(parent=None)
 eric6.Helpviewer.OfflineStorage.WebDatabasesDialog.WebDatabasesDialog?1(parent=None)
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.columnCount?4(parent=None)
 eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.data?4(index, role=Qt.DisplayRole)
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.hasChildren?4(parent=QModelIndex())
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.hasChildren?4(parent=None)
 eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.index?4(row, column, parent=QModelIndex())
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.parent?4(index=QModelIndex())
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.index?4(row, column, parent=None)
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.parent?4(index=None)
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel.rowCount?4(parent=None)
 eric6.Helpviewer.OfflineStorage.WebDatabasesModel.WebDatabasesModel?1(parent=None)
 eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qCleanupResources?4()
 eric6.Helpviewer.OpenSearch.DefaultSearchEngines.DefaultSearchEngines_rc.qInitResources?4()
@@ -2883,12 +2889,12 @@
 eric6.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine.suggestionsUrlTemplate?4()
 eric6.Helpviewer.OpenSearch.OpenSearchEngine.OpenSearchEngine?1(parent=None)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineAction.OpenSearchEngineAction?1(engine, parent=None)
-eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent=None)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.data?4(index, role)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.flags?4(index)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent=None)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.setData?4(index, value, role=Qt.EditRole)
 eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel?1(manager, parent=None)
 eric6.Helpviewer.OpenSearch.OpenSearchManager.OpenSearchManager.addEngine?4(engine)
@@ -2945,11 +2951,11 @@
 eric6.Helpviewer.Passwords.PasswordManager.PasswordManager.siteInfo?4(site)
 eric6.Helpviewer.Passwords.PasswordManager.PasswordManager.sitesCount?4()
 eric6.Helpviewer.Passwords.PasswordManager.PasswordManager?1(parent=None)
-eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.columnCount?4(parent=None)
 eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.data?4(index, role)
 eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.rowCount?4(parent=None)
 eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.setShowPasswords?4(on)
 eric6.Helpviewer.Passwords.PasswordModel.PasswordModel.showPasswords?4()
 eric6.Helpviewer.Passwords.PasswordModel.PasswordModel?1(manager, parent=None)
@@ -3200,11 +3206,11 @@
 eric6.Helpviewer.UserAgent.UserAgentManager.UserAgentManager.userAgentSettingsSaved?7
 eric6.Helpviewer.UserAgent.UserAgentManager.UserAgentManager?1(parent=None)
 eric6.Helpviewer.UserAgent.UserAgentMenu.UserAgentMenu?1(title, url=None, parent=None)
-eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.columnCount?4(parent=None)
 eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.data?4(index, role)
 eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel.rowCount?4(parent=None)
 eric6.Helpviewer.UserAgent.UserAgentModel.UserAgentModel?1(manager, parent=None)
 eric6.Helpviewer.UserAgent.UserAgentReader.UserAgentReader.read?4(fileNameOrDevice)
 eric6.Helpviewer.UserAgent.UserAgentReader.UserAgentReader?1()
@@ -3280,11 +3286,11 @@
 eric6.Helpviewer.ZoomManager.ZoomManager.ZoomManager.zoomValue?4(url)
 eric6.Helpviewer.ZoomManager.ZoomManager.ZoomManager?1(parent=None)
 eric6.Helpviewer.ZoomManager.ZoomValuesDialog.ZoomValuesDialog?1(parent=None)
-eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.columnCount?4(parent=QModelIndex())
+eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.columnCount?4(parent=None)
 eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.data?4(index, role)
 eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.rowCount?4(parent=QModelIndex())
+eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.removeRows?4(row, count, parent=None)
+eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel.rowCount?4(parent=None)
 eric6.Helpviewer.ZoomManager.ZoomValuesModel.ZoomValuesModel?1(manager, parent=None)
 eric6.HexEdit.HexEditChunks.HexEditChunk?1()
 eric6.HexEdit.HexEditChunks.HexEditChunks.BUFFER_SIZE?7
@@ -3406,7 +3412,7 @@
 eric6.HexEdit.HexEditWidget.HexEditWidget.redo?4()
 eric6.HexEdit.HexEditWidget.HexEditWidget.remove?4(pos, length=1)
 eric6.HexEdit.HexEditWidget.HexEditWidget.replace?4(pos, ch)
-eric6.HexEdit.HexEditWidget.HexEditWidget.replaceByteArray?4(pos, len, byteArray)
+eric6.HexEdit.HexEditWidget.HexEditWidget.replaceByteArray?4(pos, length, byteArray)
 eric6.HexEdit.HexEditWidget.HexEditWidget.resizeEvent?4(evt)
 eric6.HexEdit.HexEditWidget.HexEditWidget.revertToUnmodified?4()
 eric6.HexEdit.HexEditWidget.HexEditWidget.selectAll?4()
@@ -3901,6 +3907,10 @@
 eric6.Plugins.AboutPlugin.AboutDialog.licenseText?7
 eric6.Plugins.AboutPlugin.AboutDialog.thanksText?7
 eric6.Plugins.AboutPlugin.AboutDialog.titleText?7
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.CodeStyleAddBuiltinIgnoreDialog.getData?4()
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged?4(txt)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged?4(txt)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.CodeStyleAddBuiltinIgnoreDialog?1(parent=None)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.CodeStyleCheckerReport.error_args?4(line_number, offset, code, check, *args)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.CodeStyleCheckerReport?1(options)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.codeStyleBatchCheck?4(argumentsList, send, fx, cancelled)
@@ -3908,7 +3918,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.extractLineFlags?4(line, startComment=")
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.initBatchService?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.initService?4()
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.availableFutures?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.check?4(codestring='')
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.checkBatch?4()
@@ -3921,7 +3931,10 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.messageRole?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.noFiles?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.noResults?7
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_addBuiltinButton_clicked?4()
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_buttonBox_clicked?4(button)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_fixButton_clicked?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.CodeStyleCheckerDialog.on_fixIssuesSelectButton_clicked?4()
@@ -3957,6 +3970,13 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.Reindenter.run?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.Reindenter?1(sourceLines)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleStatisticsDialog.CodeStyleStatisticsDialog?1(statistics, parent=None)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.ComplexityChecker.Codes?7
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.ComplexityChecker.run?4()
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.ComplexityChecker?1(source, filename, select, ignore, args)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.LineComplexityVisitor.score?4()
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.LineComplexityVisitor.sortedList?4()
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.LineComplexityVisitor.visit?4(node)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.LineComplexityVisitor?1()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.Codes?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.run?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleChecker.unpackArgs?4()
@@ -3968,9 +3988,7 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.ssource?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext.start?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.DocStyleContext?1(source, startLine, contextType)
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.McCabeChecker.Codes?7
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.McCabeChecker.run?4()
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.McCabeChecker?1(source, filename, select, ignore, maxComplexity=10)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.MiscellaneousChecker.BuiltinsWhiteList?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.MiscellaneousChecker.Codes?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.MiscellaneousChecker.FormatFieldRegex?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.MiscellaneousChecker.Formatter?7
@@ -3998,17 +4016,17 @@
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraph.complexity?4()
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraph.connect?4(n1, n2)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraph.to_dot?4()
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraph?1(name, entity, lineno)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraph?1(name, entity, lineno, column=0)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor._subgraph?5(node, name, extra_blocks=())
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor._subgraph_parse?5(node, pathnode, extra_blocks)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.appendPathNode?4(name)
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.default?4(node, *args)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.dispatch_list?4(node_list)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.reset?4()
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitAssert?7
+eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitAsyncFor?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitAsyncFunctionDef?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitAsyncWith?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitClassDef?4(node)
-eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitFor?7
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitFunctionDef?4(node)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitIf?4(node)
 eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathGraphingAstVisitor.visitLoop?4(node)
@@ -4163,7 +4181,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.normalizeCode?4(codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesBatchCheck?4(argumentsList, send, fx, cancelled)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.syntaxAndPyflakesCheck?4(filename, codestring, checkFlakes=True, ignoreStarImportWarnings=False)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.addLanguage?4(lang, env, path, module, getArgs, getExt, callback, onError)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.batchFinished?7
 eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheckService.SyntaxCheckService.batchJobDone?4(fx, lang)
@@ -4198,7 +4216,7 @@
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxBatchCheck?4(argumentsList, send, fx, cancelled)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.jsSyntaxCheck?4(file, codestring)
 eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.normalizeCode?4(codestring)
-eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_line?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_lineno?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.NannyNag.get_msg?4()
@@ -4216,7 +4234,7 @@
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.initBatchService?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.initService?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.process_tokens?4(tokens)
-eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.worker?4(input, output)
+eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.worker?4(inputQueue, outputQueue)
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.check?4(codestring='')
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.checkBatch?4()
 eric6.Plugins.CheckerPlugins.Tabnanny.TabnannyDialog.TabnannyDialog.filenameRole?7
@@ -4766,7 +4784,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_multipleEdit_textChanged?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagButton_toggled?4(checked)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog.on_tagCombo_editTextChanged?4(txt)
-eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, parent=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.HgBundleDialog?1(tagsList, branchesList, bookmarksList=None, version=(0, 0, 0), parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.Channels?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.InputFormat?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.OutputFormat?7
@@ -4777,7 +4795,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.isExecuting?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.myprompt?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.restartServer?4()
-eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, input=None, output=None, error=None)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.runcommand?4(args, prompt=None, inputData=None, output=None, error=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.startServer?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.stopServer?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.HgClient.wasCanceled?4()
@@ -4828,7 +4846,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_input_returnPressed?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_passwordCheckBox_toggled?4(isOn)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.on_sendButton_clicked?4()
-eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir=None, showArgs=True, environment={})
+eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog.startProcess?4(args, workingDir=None, showArgs=True, environment=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.HgDialog?1(text, hg=None, useClient=True, parent=None)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.closeEvent?4(e)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgDiffDialog.HgDiffDialog.on_buttonBox_clicked?4(button)
@@ -5022,6 +5040,10 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpAddButton_clicked?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpDeleteButton_clicked?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_fpEditButton_clicked?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_protocolAddButton_clicked?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_protocolDeleteButton_clicked?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_protocolEditButton_clicked?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.on_protocolsList_currentItemChanged?4(current, previous)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.readUserConfig?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog.writeUserConfig?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.HgUserConfigDialog?1(version=(0, 0, 0), parent=None)
@@ -5032,6 +5054,10 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged?4(txt)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog.supportedHashes?7
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.HgUserConfigHostFingerprintDialog?1(parent=None, host="", fingerprint="", version=(0, 0, 0))
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.HgUserConfigHostMinimumProtocolDialog.getData?4()
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged?4(txt)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged?4(index)
+eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.HgUserConfigHostMinimumProtocolDialog?1(allowedProtocols, parent=None, host="", protocol="")
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.getConfigPath?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.hgVersion?4(plugin)
 eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.prepareProcess?4(proc, encoding="", language="")
@@ -5118,8 +5144,8 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.initMenu?4(mainMenu)
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper.menuTitle?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.ProjectHelper.PurgeProjectHelper?1()
-eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurge?4(name, all=False)
-eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurgeList?4(name, all=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurge?4(name, deleteAll=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.hgPurgeList?4(name, deleteAll=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge.shutdown?4()
 eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.Purge?1(vcs)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.HgQueuesDefineGuardsDialog.HgQueuesDefineGuardsDialog.closeEvent?4(e)
@@ -5195,7 +5221,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.QUEUE_PURGE?7
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.SERIES_LIST?7
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.UNAPPLIED_LIST?7
-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.getGuardsList?4(repodir, all=True)
+eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.getGuardsList?4(repodir, allGuards=True)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueCreateRenameQueue?4(name, isCreate)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueDeletePatch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueDeletePurgeActivateQueue?4(name, operation)
@@ -5212,7 +5238,7 @@
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListPatches?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueListQueues?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueNewPatch?4(name)
-eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueuePushPopPatches?4(name, operation, all=False, named=False, force=False)
+eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueuePushPopPatches?4(name, operation, doAll=False, named=False, force=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueRefreshPatch?4(name, editMessage=False)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueRenamePatch?4(name)
 eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.Queues.hgQueueShowHeader?4(name)
@@ -5869,7 +5895,7 @@
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsTag?4(name)
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion.vcsUpdate?4(name, noDialog=False)
 eric6.Plugins.VcsPlugins.vcsSubversion.subversion.Subversion?1(plugin, parent=None, name=None)
-eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn=None, noName="", next=False)
+eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._addView?5(win, fn=None, noName="", addNext=False)
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._initWindowActions?5()
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._modificationStatusChanged?5(m, editor)
 eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.Listspace._removeAllViews?5()
@@ -5936,14 +5962,14 @@
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.currentWidget?4()
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.hasEditor?4(editor)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.hasEditors?4()
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.indexOf?4(object)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.indexOf?4(widget)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.insertWidget?4(index, assembly, title)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.mouseDoubleClickEvent?4(event)
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.removeWidget?4(object)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.removeWidget?4(widget)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.setCurrentWidget?4(assembly)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget.showIndicator?4(on)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.TabWidget?1(vm)
-eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn=None, noName="", next=False)
+eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._addView?5(win, fn=None, noName="", addNext=False)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._initWindowActions?5()
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._modificationStatusChanged?5(m, editor)
 eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.Tabview._removeAllViews?5()
@@ -6175,7 +6201,7 @@
 eric6.Preferences.ConfigurationDialog.ConfigurationDialog.preferencesChanged?7
 eric6.Preferences.ConfigurationDialog.ConfigurationDialog.setPreferences?4()
 eric6.Preferences.ConfigurationDialog.ConfigurationDialog.showConfigurationPageByName?4(pageName)
-eric6.Preferences.ConfigurationDialog.ConfigurationDialog?1(parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=[], webEngine=False)
+eric6.Preferences.ConfigurationDialog.ConfigurationDialog?1(parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=None, webEngine=False)
 eric6.Preferences.ConfigurationDialog.ConfigurationPageItem.getPageName?4()
 eric6.Preferences.ConfigurationDialog.ConfigurationPageItem?1(parent, text, pageName, iconFile)
 eric6.Preferences.ConfigurationDialog.ConfigurationWidget.DefaultMode?7
@@ -6201,7 +6227,7 @@
 eric6.Preferences.ConfigurationDialog.ConfigurationWidget.rejected?7
 eric6.Preferences.ConfigurationDialog.ConfigurationWidget.setPreferences?4()
 eric6.Preferences.ConfigurationDialog.ConfigurationWidget.showConfigurationPageByName?4(pageName, setCurrent=True)
-eric6.Preferences.ConfigurationDialog.ConfigurationWidget?1(parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=[], webEngine=False)
+eric6.Preferences.ConfigurationDialog.ConfigurationWidget?1(parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=None, webEngine=False)
 eric6.Preferences.ConfigurationDialog.ConfigurationWindow.accept?4()
 eric6.Preferences.ConfigurationDialog.ConfigurationWindow.showConfigurationPageByName?4(pageName)
 eric6.Preferences.ConfigurationDialog.ConfigurationWindow?1(parent=None, webEngine=False)
@@ -6212,7 +6238,7 @@
 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.polishPage?4()
 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.saveColours?4(prefMethod)
 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.saveState?4()
-eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectFont?4(fontSample, fontVar, showFontInfo=False, options=QFontDialog.FontDialogOptions(0))
+eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.selectFont?4(fontSample, fontVar, showFontInfo=False, options=None)
 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase.setState?4(state)
 eric6.Preferences.ConfigurationPages.ConfigurationPageBase.ConfigurationPageBase?1()
 eric6.Preferences.ConfigurationPages.CooperationPage.CooperationPage.on_addBannedUserButton_clicked?4()
@@ -6737,12 +6763,12 @@
 eric6.Preferences.toList?4(value)
 eric6.Project.AddDirectoryDialog.AddDirectoryDialog.getData?4()
 eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_filterComboBox_highlighted?4(fileType)
-eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirPicker_textChanged?4(dir)
-eric6.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, filter='source', parent=None, name=None, startdir=None)
+eric6.Project.AddDirectoryDialog.AddDirectoryDialog.on_sourceDirPicker_textChanged?4(directory)
+eric6.Project.AddDirectoryDialog.AddDirectoryDialog?1(pro, fileTypeFilter='source', parent=None, name=None, startdir=None)
 eric6.Project.AddFileDialog.AddFileDialog.getData?4()
 eric6.Project.AddFileDialog.AddFileDialog.on_sourceFilesPicker_aboutToShowPathPickerDialog?4()
 eric6.Project.AddFileDialog.AddFileDialog.on_sourceFilesPicker_textChanged?4(sfile)
-eric6.Project.AddFileDialog.AddFileDialog?1(pro, parent=None, filter=None, name=None, startdir=None)
+eric6.Project.AddFileDialog.AddFileDialog?1(pro, parent=None, fileTypeFilter=None, name=None, startdir=None)
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.getSelection?4()
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addAllButton_clicked?4()
 eric6.Project.AddFoundFilesDialog.AddFoundFilesDialog.on_addSelectedButton_clicked?4()
@@ -6790,9 +6816,9 @@
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.getData?4()
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog.on_packageEdit_textChanged?4(txt)
 eric6.Project.NewPythonPackageDialog.NewPythonPackageDialog?1(relPath, parent=None)
-eric6.Project.Project.Project.addDirectory?4(filter=None, startdir=None)
+eric6.Project.Project.Project.addDirectory?4(fileTypeFilter=None, startdir=None)
 eric6.Project.Project.Project.addE5Actions?4(actions)
-eric6.Project.Project.Project.addFiles?4(filter=None, startdir=None)
+eric6.Project.Project.Project.addFiles?4(fileTypeFilter=None, startdir=None)
 eric6.Project.Project.Project.addIdlDir?4()
 eric6.Project.Project.Project.addIdlFiles?4()
 eric6.Project.Project.Project.addLanguage?4()
@@ -6968,7 +6994,7 @@
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeDir?5()
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._removeFile?5()
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._renameFile?5()
-eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local=True, filter=None)
+eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectEntries?5(local=True, filterList=None)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._selectSingleItem?5(index)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemRangeSelected?5(startIndex, endIndex, selected)
 eric6.Project.ProjectBaseBrowser.ProjectBaseBrowser._setItemSelected?5(index, selected)
@@ -7020,7 +7046,7 @@
 eric6.Project.ProjectBrowserModel.ProjectBrowserItemMixin.setVcsStatus?4(vcsStatus)
 eric6.Project.ProjectBrowserModel.ProjectBrowserItemMixin?1(type_, bold=False)
 eric6.Project.ProjectBrowserModel.ProjectBrowserItemSimpleDirectory?7
-eric6.Project.ProjectBrowserModel.ProjectBrowserModel.addNewItem?4(typeString, name, additionalTypeStrings=[])
+eric6.Project.ProjectBrowserModel.ProjectBrowserModel.addNewItem?4(typeString, name, additionalTypeStrings=None)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.changeVCSStates?4(statesList)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.data?4(index, role)
 eric6.Project.ProjectBrowserModel.ProjectBrowserModel.directoryChanged?4(path)
@@ -7166,13 +7192,13 @@
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_aboutToShowPathPickerDialog?4()
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_editTextChanged?4(txt)
 eric6.PyUnit.UnittestDialog.UnittestDialog.on_testsuitePicker_pathSelected?4(suite)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testErrored?4(test, exc, id)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testFailed?4(test, exc, id)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testFailedExpected?4(test, exc, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testErrored?4(test, exc, testId)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testFailed?4(test, exc, testId)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testFailedExpected?4(test, exc, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.testFinished?4()
-eric6.PyUnit.UnittestDialog.UnittestDialog.testSkipped?4(test, reason, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testSkipped?4(test, reason, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.testStarted?4(test, doc)
-eric6.PyUnit.UnittestDialog.UnittestDialog.testSucceededUnexpected?4(test, id)
+eric6.PyUnit.UnittestDialog.UnittestDialog.testSucceededUnexpected?4(test, testId)
 eric6.PyUnit.UnittestDialog.UnittestDialog.unittestFile?7
 eric6.PyUnit.UnittestDialog.UnittestDialog.unittestStopped?7
 eric6.PyUnit.UnittestDialog.UnittestDialog?1(prog=None, dbs=None, ui=None, fromEric=False, parent=None, name=None)
@@ -7442,7 +7468,7 @@
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap._paintIt?5(painter)
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap.initColors?4()
 eric6.QScintilla.EditorMarkerMap.EditorMarkerMap?1(parent=None)
-eric6.QScintilla.Exporters.ExporterBase.ExporterBase._getFileName?5(filter)
+eric6.QScintilla.Exporters.ExporterBase.ExporterBase._getFileName?5(fileFilter)
 eric6.QScintilla.Exporters.ExporterBase.ExporterBase.exportSource?4()
 eric6.QScintilla.Exporters.ExporterBase.ExporterBase?1(editor, parent=None)
 eric6.QScintilla.Exporters.ExporterHTML.ExporterHTML.exportSource?4()
@@ -7508,7 +7534,7 @@
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX.CHARZ?7
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX.exportSource?4()
 eric6.QScintilla.Exporters.ExporterTEX.ExporterTEX?1(editor, parent=None)
-eric6.QScintilla.Exporters.getExporter?4(format, editor)
+eric6.QScintilla.Exporters.getExporter?4(exporterFormat, editor)
 eric6.QScintilla.Exporters.getSupportedFormats?4()
 eric6.QScintilla.GotoDialog.GotoDialog.getLinenumber?4()
 eric6.QScintilla.GotoDialog.GotoDialog?1(maximum, curLine, parent, name=None, modal=False)
@@ -7812,7 +7838,7 @@
 eric6.QScintilla.Lexers.getSaveFileFiltersList?4(includeAll=False, asString=False, withAdditional=True)
 eric6.QScintilla.Lexers.getSupportedApiLanguages?4()
 eric6.QScintilla.Lexers.getSupportedLanguages?4()
-eric6.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[], iconFileName="")
+eric6.QScintilla.Lexers.registerLexer?4(name, displayString, filenameSample, getLexerFunc, openFilters=None, saveFilters=None, defaultAssocs=None, iconFileName="")
 eric6.QScintilla.Lexers.unregisterLexer?4(name)
 eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bold?4(editor)
 eric6.QScintilla.MarkupProviders.HtmlProvider.HtmlProvider.bulletedList?4(editor)
@@ -8050,7 +8076,7 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setStyling?4(length, style)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.setVirtualSpaceOptions?4(options)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showFindIndicator?4(sline, sindex, eline, eindex)
-eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(id, lst)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(listId, lst)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.updateVerticalScrollBar?4()
@@ -8096,7 +8122,7 @@
 eric6.QScintilla.Shell.Shell.event?4(evt)
 eric6.QScintilla.Shell.Shell.executeLines?4(lines)
 eric6.QScintilla.Shell.Shell.focusInEvent?4(event)
-eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(next)
+eric6.QScintilla.Shell.Shell.focusNextPrevChild?4(nextChild)
 eric6.QScintilla.Shell.Shell.focusOutEvent?4(event)
 eric6.QScintilla.Shell.Shell.gestureEvent?4(evt)
 eric6.QScintilla.Shell.Shell.getClientType?4()
@@ -8204,7 +8230,7 @@
 eric6.Snapshot.SnapshotFreehandGrabber.SnapshotFreehandGrabber.mouseReleaseEvent?4(evt)
 eric6.Snapshot.SnapshotFreehandGrabber.SnapshotFreehandGrabber.paintEvent?4(evt)
 eric6.Snapshot.SnapshotFreehandGrabber.SnapshotFreehandGrabber?1()
-eric6.Snapshot.SnapshotFreehandGrabber.drawPolygon?4(painter, polygon, outline, fill=QColor())
+eric6.Snapshot.SnapshotFreehandGrabber.drawPolygon?4(painter, polygon, outline, fill=None)
 eric6.Snapshot.SnapshotPreview.SnapshotPreview.mouseMoveEvent?4(evt)
 eric6.Snapshot.SnapshotPreview.SnapshotPreview.mousePressEvent?4(evt)
 eric6.Snapshot.SnapshotPreview.SnapshotPreview.mouseReleaseEvent?4(evt)
@@ -8224,14 +8250,14 @@
 eric6.Snapshot.SnapshotRegionGrabber.SnapshotRegionGrabber.paintEvent?4(evt)
 eric6.Snapshot.SnapshotRegionGrabber.SnapshotRegionGrabber.resizeEvent?4(evt)
 eric6.Snapshot.SnapshotRegionGrabber.SnapshotRegionGrabber?1(mode=Rectangle)
-eric6.Snapshot.SnapshotRegionGrabber.drawRect?4(painter, rect, outline, fill=QColor())
+eric6.Snapshot.SnapshotRegionGrabber.drawRect?4(painter, rect, outline, fill=None)
 eric6.Snapshot.SnapshotTimer.SnapshotTimer.enterEvent?4(evt)
 eric6.Snapshot.SnapshotTimer.SnapshotTimer.paintEvent?4(evt)
 eric6.Snapshot.SnapshotTimer.SnapshotTimer.start?4(seconds)
 eric6.Snapshot.SnapshotTimer.SnapshotTimer.stop?4()
 eric6.Snapshot.SnapshotTimer.SnapshotTimer.timeout?7
 eric6.Snapshot.SnapshotTimer.SnapshotTimer?1()
-eric6.SqlBrowser.SqlBrowser.SqlBrowser?1(connections=[], parent=None)
+eric6.SqlBrowser.SqlBrowser.SqlBrowser?1(connections=None, parent=None)
 eric6.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.addConnection?4(driver, dbName, user, password, host, port)
 eric6.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.addConnectionByDialog?4()
 eric6.SqlBrowser.SqlBrowserWidget.SqlBrowserWidget.cCount?7
@@ -8281,11 +8307,11 @@
 eric6.Tasks.Task.Task?1(summary, priority=1, filename="", lineno=0, completed=False, _time=0, isProjectTask=False, taskType=TypeTodo, project=None, description="", uid="", parentUid="")
 eric6.Tasks.TaskFilter.TaskFilter.hasActiveFilter?4()
 eric6.Tasks.TaskFilter.TaskFilter.setActive?4(enabled)
-eric6.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filter)
+eric6.Tasks.TaskFilter.TaskFilter.setFileNameFilter?4(filterStr)
 eric6.Tasks.TaskFilter.TaskFilter.setPrioritiesFilter?4(priorities)
 eric6.Tasks.TaskFilter.TaskFilter.setScopeFilter?4(scope)
 eric6.Tasks.TaskFilter.TaskFilter.setStatusFilter?4(status)
-eric6.Tasks.TaskFilter.TaskFilter.setSummaryFilter?4(filter)
+eric6.Tasks.TaskFilter.TaskFilter.setSummaryFilter?4(filterStr)
 eric6.Tasks.TaskFilter.TaskFilter.setTypeFilter?4(taskType)
 eric6.Tasks.TaskFilter.TaskFilter.showTask?4(task)
 eric6.Tasks.TaskFilter.TaskFilter?1()
@@ -8389,7 +8415,7 @@
 eric6.Tools.TRPreviewer.TRPreviewer.reloadTranslations?4()
 eric6.Tools.TRPreviewer.TRPreviewer.setTranslation?4(name)
 eric6.Tools.TRPreviewer.TRPreviewer.show?4()
-eric6.Tools.TRPreviewer.TRPreviewer?1(filenames=[], parent=None, name=None)
+eric6.Tools.TRPreviewer.TRPreviewer?1(filenames=None, parent=None, name=None)
 eric6.Tools.TRPreviewer.Translation?1()
 eric6.Tools.TRPreviewer.TranslationsDict.add?4(fileName, setTranslation=True)
 eric6.Tools.TRPreviewer.TranslationsDict.hasTranslations?4()
@@ -8444,9 +8470,9 @@
 eric6.UI.Browser.Browser._showGotoMenu?5()
 eric6.UI.Browser.Browser.binaryFile?7
 eric6.UI.Browser.Browser.designerFile?7
-eric6.UI.Browser.Browser.getSelectedItems?4(filter=None)
-eric6.UI.Browser.Browser.getSelectedItemsCount?4(filter=None)
-eric6.UI.Browser.Browser.getSelectedItemsCountCategorized?4(filter=None)
+eric6.UI.Browser.Browser.getSelectedItems?4(filterList=None)
+eric6.UI.Browser.Browser.getSelectedItemsCount?4(filterList=None)
+eric6.UI.Browser.Browser.getSelectedItemsCountCategorized?4(filterList=None)
 eric6.UI.Browser.Browser.handleInterpreterChanged?4(interpreter)
 eric6.UI.Browser.Browser.handlePreferencesChanged?4()
 eric6.UI.Browser.Browser.handleProgramChange?4(fn)
@@ -8464,7 +8490,7 @@
 eric6.UI.Browser.Browser.svgFile?7
 eric6.UI.Browser.Browser.trpreview?7
 eric6.UI.Browser.Browser.unittestOpen?7
-eric6.UI.Browser.Browser.wantedItem?4(itm, filter=None)
+eric6.UI.Browser.Browser.wantedItem?4(itm, filterList=None)
 eric6.UI.Browser.Browser?1(parent=None)
 eric6.UI.BrowserModel.BrowserClassAttributeItem.attributeObject?4()
 eric6.UI.BrowserModel.BrowserClassAttributeItem.fileName?4()
@@ -8562,16 +8588,16 @@
 eric6.UI.BrowserModel.BrowserModel._addItem?5(itm, parentItem)
 eric6.UI.BrowserModel.BrowserModel._addWatchedItem?5(itm)
 eric6.UI.BrowserModel.BrowserModel._removeWatchedItem?5(itm)
-eric6.UI.BrowserModel.BrowserModel.addItem?4(itm, parent=QModelIndex())
+eric6.UI.BrowserModel.BrowserModel.addItem?4(itm, parent=None)
 eric6.UI.BrowserModel.BrowserModel.addTopLevelDir?4(dirname)
 eric6.UI.BrowserModel.BrowserModel.clear?4()
-eric6.UI.BrowserModel.BrowserModel.columnCount?4(parent=QModelIndex())
+eric6.UI.BrowserModel.BrowserModel.columnCount?4(parent=None)
 eric6.UI.BrowserModel.BrowserModel.data?4(index, role)
 eric6.UI.BrowserModel.BrowserModel.directoryChanged?4(path)
 eric6.UI.BrowserModel.BrowserModel.flags?4(index)
-eric6.UI.BrowserModel.BrowserModel.hasChildren?4(parent=QModelIndex())
+eric6.UI.BrowserModel.BrowserModel.hasChildren?4(parent=None)
 eric6.UI.BrowserModel.BrowserModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.UI.BrowserModel.BrowserModel.index?4(row, column, parent=QModelIndex())
+eric6.UI.BrowserModel.BrowserModel.index?4(row, column, parent=None)
 eric6.UI.BrowserModel.BrowserModel.interpreterChanged?4(interpreter)
 eric6.UI.BrowserModel.BrowserModel.item?4(index)
 eric6.UI.BrowserModel.BrowserModel.parent?4(index)
@@ -8584,13 +8610,13 @@
 eric6.UI.BrowserModel.BrowserModel.populateSysPathItem?4(parentItem, repopulate=False)
 eric6.UI.BrowserModel.BrowserModel.programChange?4(dirname)
 eric6.UI.BrowserModel.BrowserModel.removeToplevelDir?4(index)
-eric6.UI.BrowserModel.BrowserModel.rowCount?4(parent=QModelIndex())
+eric6.UI.BrowserModel.BrowserModel.rowCount?4(parent=None)
 eric6.UI.BrowserModel.BrowserModel.saveToplevelDirs?4()
 eric6.UI.BrowserModel.BrowserModel?1(parent=None, nopopulate=False)
 eric6.UI.BrowserModel.BrowserSysPathItem.name?4()
 eric6.UI.BrowserModel.BrowserSysPathItem?1(parent)
 eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.filterAcceptsRow?4(source_row, source_parent)
-eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.hasChildren?4(parent=QModelIndex())
+eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.hasChildren?4(parent=None)
 eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.item?4(index)
 eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.lessThan?4(left, right)
 eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel.preferencesChanged?4()
@@ -8607,9 +8633,9 @@
 eric6.UI.CompareDialog.CompareDialog.on_synchronizeCheckBox_toggled?4(sync)
 eric6.UI.CompareDialog.CompareDialog.on_upButton_clicked?4()
 eric6.UI.CompareDialog.CompareDialog.show?4(filename=None)
-eric6.UI.CompareDialog.CompareDialog?1(files=[], parent=None)
+eric6.UI.CompareDialog.CompareDialog?1(files=None, parent=None)
 eric6.UI.CompareDialog.CompareWindow.eventFilter?4(obj, event)
-eric6.UI.CompareDialog.CompareWindow?1(files=[], parent=None)
+eric6.UI.CompareDialog.CompareWindow?1(files=None, parent=None)
 eric6.UI.CompareDialog.removeMarkers?4(line)
 eric6.UI.CompareDialog.sbsdiff?4(a, b, linenumberwidth=4)
 eric6.UI.Config.ToolBarIconSize?7
@@ -8803,7 +8829,7 @@
 eric6.UI.UserInterface.UserInterface.LeftSide?7
 eric6.UI.UserInterface.UserInterface.RightSide?7
 eric6.UI.UserInterface.UserInterface.activateCooperationViewer?4()
-eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, type)
+eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, actionType)
 eric6.UI.UserInterface.UserInterface.addSideWidget?4(side, widget, icon, label)
 eric6.UI.UserInterface.UserInterface.appendStderr?7
 eric6.UI.UserInterface.UserInterface.appendStdout?7
@@ -8820,7 +8846,7 @@
 eric6.UI.UserInterface.UserInterface.dragLeaveEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dragMoveEvent?4(event)
 eric6.UI.UserInterface.UserInterface.dropEvent?4(event)
-eric6.UI.UserInterface.UserInterface.getActions?4(type)
+eric6.UI.UserInterface.UserInterface.getActions?4(actionType)
 eric6.UI.UserInterface.UserInterface.getHelpViewer?4(preview=False)
 eric6.UI.UserInterface.UserInterface.getLocale?4()
 eric6.UI.UserInterface.UserInterface.getMenu?4(name)
@@ -8841,7 +8867,7 @@
 eric6.UI.UserInterface.UserInterface.processArgs?4(args)
 eric6.UI.UserInterface.UserInterface.registerToolbar?4(name, text, toolbar)
 eric6.UI.UserInterface.UserInterface.reloadAPIs?7
-eric6.UI.UserInterface.UserInterface.removeE5Actions?4(actions, type='ui')
+eric6.UI.UserInterface.UserInterface.removeE5Actions?4(actions, actionType='ui')
 eric6.UI.UserInterface.UserInterface.removeSideWidget?4(widget)
 eric6.UI.UserInterface.UserInterface.reregisterToolbar?4(name, text)
 eric6.UI.UserInterface.UserInterface.setDebugProfile?4(save=True)
@@ -8882,7 +8908,7 @@
 eric6.Utilities.BackgroundService.BackgroundService?1()
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Attribute.addAssignment?4(lineno)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.ClbrBaseClasses.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addattribute?5(attr)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addclass?5(name, _class)
 eric6.Utilities.ClassBrowsers.ClbrBaseClasses.ClbrBase._addglobal?5(attr)
@@ -8914,7 +8940,7 @@
 eric6.Utilities.ClassBrowsers.find_module?4(name, path, isPyFile=False)
 eric6.Utilities.ClassBrowsers.idlclbr.Attribute?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.Function?1(module, name, file, lineno, signature='', separator=', ')
-eric6.Utilities.ClassBrowsers.idlclbr.Interface?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.idlclbr.Interface?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.Module?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.idlclbr.SUPPORTED_TYPES?7
 eric6.Utilities.ClassBrowsers.idlclbr.VisibilityMixin?1()
@@ -8922,7 +8948,7 @@
 eric6.Utilities.ClassBrowsers.idlclbr._getnext?8
 eric6.Utilities.ClassBrowsers.idlclbr._modules?8
 eric6.Utilities.ClassBrowsers.idlclbr._normalize?8
-eric6.Utilities.ClassBrowsers.idlclbr.readmodule_ex?4(module, path=[])
+eric6.Utilities.ClassBrowsers.idlclbr.readmodule_ex?4(module, path=None)
 eric6.Utilities.ClassBrowsers.jsclbr.Attribute?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.jsclbr.Function?1(module, name, file, lineno, signature='', separator=', ')
 eric6.Utilities.ClassBrowsers.jsclbr.SUPPORTED_TYPES?7
@@ -8936,9 +8962,9 @@
 eric6.Utilities.ClassBrowsers.jsclbr.Visitor.visit_var?4(node)
 eric6.Utilities.ClassBrowsers.jsclbr.Visitor?1(src, module, filename)
 eric6.Utilities.ClassBrowsers.jsclbr._modules?8
-eric6.Utilities.ClassBrowsers.jsclbr.readmodule_ex?4(module, path=[])
+eric6.Utilities.ClassBrowsers.jsclbr.readmodule_ex?4(module, path=None)
 eric6.Utilities.ClassBrowsers.pyclbr.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.pyclbr.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.pyclbr.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.pyclbr.Function?1(module, name, file, lineno, signature='', separator=', ', modifierType=ClbrBaseClasses.Function.General, annotation="")
 eric6.Utilities.ClassBrowsers.pyclbr.ImportedModule.addImport?4(lineno, importedNames)
 eric6.Utilities.ClassBrowsers.pyclbr.ImportedModule?1(module, file, importedModule)
@@ -8954,9 +8980,9 @@
 eric6.Utilities.ClassBrowsers.pyclbr._getnext?8
 eric6.Utilities.ClassBrowsers.pyclbr._indent?5(ws)
 eric6.Utilities.ClassBrowsers.pyclbr._modules?8
-eric6.Utilities.ClassBrowsers.pyclbr.readmodule_ex?4(module, path=[], inpackage=False, isPyFile=False)
+eric6.Utilities.ClassBrowsers.pyclbr.readmodule_ex?4(module, path=None, inpackage=False, isPyFile=False)
 eric6.Utilities.ClassBrowsers.rbclbr.Attribute?1(module, name, file, lineno)
-eric6.Utilities.ClassBrowsers.rbclbr.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ClassBrowsers.rbclbr.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ClassBrowsers.rbclbr.Function?1(module, name, file, lineno, signature='', separator=', ')
 eric6.Utilities.ClassBrowsers.rbclbr.Module?1(module, name, file, lineno)
 eric6.Utilities.ClassBrowsers.rbclbr.SUPPORTED_TYPES?7
@@ -8964,8 +8990,8 @@
 eric6.Utilities.ClassBrowsers.rbclbr._commentsub?8
 eric6.Utilities.ClassBrowsers.rbclbr._getnext?8
 eric6.Utilities.ClassBrowsers.rbclbr._modules?8
-eric6.Utilities.ClassBrowsers.rbclbr.readmodule_ex?4(module, path=[])
-eric6.Utilities.ClassBrowsers.readmodule?4(module, path=[], isPyFile=False)
+eric6.Utilities.ClassBrowsers.rbclbr.readmodule_ex?4(module, path=None)
+eric6.Utilities.ClassBrowsers.readmodule?4(module, path=None, isPyFile=False)
 eric6.Utilities.CodingError?1(coding)
 eric6.Utilities.FtpUtilities.FtpDirLineParser.MonthnamesNumbers?7
 eric6.Utilities.FtpUtilities.FtpDirLineParser.parseLine?4(line)
@@ -8981,7 +9007,7 @@
 eric6.Utilities.ModuleParser.Class.getAttribute?4(name)
 eric6.Utilities.ModuleParser.Class.getMethod?4(name)
 eric6.Utilities.ModuleParser.Class.setEndLine?4(endLineNo)
-eric6.Utilities.ModuleParser.Class?1(module, name, super, file, lineno)
+eric6.Utilities.ModuleParser.Class?1(module, name, superClasses, file, lineno)
 eric6.Utilities.ModuleParser.Function.Class?7
 eric6.Utilities.ModuleParser.Function.General?7
 eric6.Utilities.ModuleParser.Function.Static?7
@@ -9000,7 +9026,7 @@
 eric6.Utilities.ModuleParser.Module.getName?4()
 eric6.Utilities.ModuleParser.Module.getType?4()
 eric6.Utilities.ModuleParser.Module.scan?4(src)
-eric6.Utilities.ModuleParser.Module?1(name, file=None, type=None)
+eric6.Utilities.ModuleParser.Module?1(name, file=None, moduleType=None)
 eric6.Utilities.ModuleParser.PTL_SOURCE?7
 eric6.Utilities.ModuleParser.RB_SOURCE?7
 eric6.Utilities.ModuleParser.RbModule.addClass?4(name, _class)
@@ -9022,7 +9048,7 @@
 eric6.Utilities.ModuleParser._rb_getnext?8
 eric6.Utilities.ModuleParser.find_module?4(name, path, extensions)
 eric6.Utilities.ModuleParser.getTypeFromTypeName?4(name)
-eric6.Utilities.ModuleParser.readModule?4(module, path=[], inpackage=False, basename="", extensions=None, caching=True)
+eric6.Utilities.ModuleParser.readModule?4(module, path=None, inpackage=False, basename="", extensions=None, caching=True)
 eric6.Utilities.ModuleParser.resetParsedModule?4(module, basename="")
 eric6.Utilities.ModuleParser.resetParsedModules?4()
 eric6.Utilities.MouseUtilities.MouseButtonModifier2String?4(modifiers, button)
@@ -9049,7 +9075,7 @@
 eric6.Utilities.binplistlib.PlistReader.contents?7
 eric6.Utilities.binplistlib.PlistReader.currentOffset?7
 eric6.Utilities.binplistlib.PlistReader.file?7
-eric6.Utilities.binplistlib.PlistReader.getSizedInteger?4(data, bytes)
+eric6.Utilities.binplistlib.PlistReader.getSizedInteger?4(data, length)
 eric6.Utilities.binplistlib.PlistReader.offsets?7
 eric6.Utilities.binplistlib.PlistReader.parse?4()
 eric6.Utilities.binplistlib.PlistReader.proc_extra?4()
@@ -9058,7 +9084,7 @@
 eric6.Utilities.binplistlib.PlistReader.readData?4(length)
 eric6.Utilities.binplistlib.PlistReader.readDate?4()
 eric6.Utilities.binplistlib.PlistReader.readDict?4(count)
-eric6.Utilities.binplistlib.PlistReader.readInteger?4(bytes)
+eric6.Utilities.binplistlib.PlistReader.readInteger?4(length)
 eric6.Utilities.binplistlib.PlistReader.readObject?4()
 eric6.Utilities.binplistlib.PlistReader.readReal?4(length)
 eric6.Utilities.binplistlib.PlistReader.readRefs?4(count)
@@ -9070,7 +9096,7 @@
 eric6.Utilities.binplistlib.PlistReader.trailer?7
 eric6.Utilities.binplistlib.PlistReader?1(fileOrStream)
 eric6.Utilities.binplistlib.PlistTrailer?7
-eric6.Utilities.binplistlib.PlistWriter.binaryInt?4(obj, bytes=None)
+eric6.Utilities.binplistlib.PlistWriter.binaryInt?4(obj, length=None)
 eric6.Utilities.binplistlib.PlistWriter.binaryReal?4(obj)
 eric6.Utilities.binplistlib.PlistWriter.byteCounts?7
 eric6.Utilities.binplistlib.PlistWriter.computeOffsets?4(obj, asReference=False, isRoot=False)
@@ -9129,7 +9155,7 @@
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.ModeOfOperation?7
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.aes?7
 eric6.Utilities.crypto.py3AES.AESModeOfOperation.decrypt?4(cipherIn, originalsize, mode, key, size, IV)
-eric6.Utilities.crypto.py3AES.AESModeOfOperation.encrypt?4(input, mode, key, size, IV)
+eric6.Utilities.crypto.py3AES.AESModeOfOperation.encrypt?4(inputData, mode, key, size, IV)
 eric6.Utilities.crypto.py3AES.append_PKCS7_padding?4(b)
 eric6.Utilities.crypto.py3AES.decryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"])
 eric6.Utilities.crypto.py3AES.encryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"])
@@ -9140,14 +9166,14 @@
 eric6.Utilities.crypto.py3PBKDF2.hashPasswordTuple?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32)
 eric6.Utilities.crypto.py3PBKDF2.pbkdf2?4(password, salt, iterations, digestMod)
 eric6.Utilities.crypto.py3PBKDF2.rehashPassword?4(password, hashParameters)
-eric6.Utilities.crypto.py3PBKDF2.verifyPassword?4(password, hash)
+eric6.Utilities.crypto.py3PBKDF2.verifyPassword?4(password, pwHash)
 eric6.Utilities.decode?4(text)
 eric6.Utilities.decodeBytes?4(buffer)
 eric6.Utilities.decodeString?4(text)
 eric6.Utilities.determinePythonVersion?4(filename, source, editor=None)
 eric6.Utilities.direntries?4(path, filesonly=False, pattern=None, followsymlinks=True, checkStop=None)
 eric6.Utilities.encode?4(text, orig_coding)
-eric6.Utilities.escape_entities?4(m, map=_escape_map)
+eric6.Utilities.escape_entities?4(m, escmap=_escape_map)
 eric6.Utilities.escape_uentities?4(m)
 eric6.Utilities.extractFlags?4(text)
 eric6.Utilities.extractFlagsFromFile?4(filename)
@@ -9207,7 +9233,7 @@
 eric6.Utilities.supportedCodecs?7
 eric6.Utilities.toBool?4(dataStr)
 eric6.Utilities.toNativeSeparators?4(path)
-eric6.Utilities.uic.compileUiFiles?4(dir, recurse=False)
+eric6.Utilities.uic.compileUiFiles?4(directory, recurse=False)
 eric6.Utilities.unescape_uentities?4(m)
 eric6.Utilities.win32_GetUserName?4()
 eric6.Utilities.win32_Kill?4(pid)
@@ -9323,7 +9349,7 @@
 eric6.VCS.VersionControl.VersionControl.vcsRepositoryInfos?4(ppath)
 eric6.VCS.VersionControl.VersionControl.vcsRevert?4(name)
 eric6.VCS.VersionControl.VersionControl.vcsSetData?4(key, value)
-eric6.VCS.VersionControl.VersionControl.vcsSetDataFromDict?4(dict)
+eric6.VCS.VersionControl.VersionControl.vcsSetDataFromDict?4(dictionary)
 eric6.VCS.VersionControl.VersionControl.vcsSetOptions?4(options)
 eric6.VCS.VersionControl.VersionControl.vcsSetOtherData?4(data)
 eric6.VCS.VersionControl.VersionControl.vcsShutdown?4()
@@ -9352,7 +9378,7 @@
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.focusInEvent?4(evt)
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.gotFocus?7
 eric6.ViewManager.ViewManager.QuickSearchLineEdit.keyPressEvent?4(evt)
-eric6.ViewManager.ViewManager.ViewManager._addView?5(win, fn=None, noName="", next=False)
+eric6.ViewManager.ViewManager.ViewManager._addView?5(win, fn=None, noName="", addNext=False)
 eric6.ViewManager.ViewManager.ViewManager._checkActions?5(editor, setSb=True)
 eric6.ViewManager.ViewManager.ViewManager._getOpenFileFilter?5()
 eric6.ViewManager.ViewManager.ViewManager._getOpenStartDir?5()
@@ -9402,12 +9428,12 @@
 eric6.ViewManager.ViewManager.ViewManager.editorTextChanged?7
 eric6.ViewManager.ViewManager.ViewManager.editorsCheckFocusInEnabled?4()
 eric6.ViewManager.ViewManager.ViewManager.enableEditorsCheckFocusIn?4(enabled)
-eric6.ViewManager.ViewManager.ViewManager.eventFilter?4(object, event)
+eric6.ViewManager.ViewManager.ViewManager.eventFilter?4(qobject, event)
 eric6.ViewManager.ViewManager.ViewManager.exit?4()
 eric6.ViewManager.ViewManager.ViewManager.getAPIsManager?4()
-eric6.ViewManager.ViewManager.ViewManager.getActions?4(type)
+eric6.ViewManager.ViewManager.ViewManager.getActions?4(actionSetType)
 eric6.ViewManager.ViewManager.ViewManager.getActiveName?4()
-eric6.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype="", next=False)
+eric6.ViewManager.ViewManager.ViewManager.getEditor?4(fn, filetype="", addNext=False)
 eric6.ViewManager.ViewManager.ViewManager.getMostRecent?4()
 eric6.ViewManager.ViewManager.ViewManager.getNumber?4()
 eric6.ViewManager.ViewManager.ViewManager.getOpenEditor?4(fn)
@@ -9439,7 +9465,7 @@
 eric6.ViewManager.ViewManager.ViewManager.newEditorView?4(fn, caller, filetype="")
 eric6.ViewManager.ViewManager.ViewManager.nextSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.openFiles?4(prog)
-eric6.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, next=False)
+eric6.ViewManager.ViewManager.ViewManager.openSourceFile?4(fn, lineno=-1, filetype="", selStart=0, selEnd=0, pos=0, addNext=False)
 eric6.ViewManager.ViewManager.ViewManager.preferencesChanged?4()
 eric6.ViewManager.ViewManager.ViewManager.prevSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.previewStateChanged?7
@@ -9450,7 +9476,7 @@
 eric6.ViewManager.ViewManager.ViewManager.projectFileRenamed?4(oldfn, newfn)
 eric6.ViewManager.ViewManager.ViewManager.projectLexerAssociationsChanged?4()
 eric6.ViewManager.ViewManager.ViewManager.projectOpened?4()
-eric6.ViewManager.ViewManager.ViewManager.receive?4(hash, fileName, command)
+eric6.ViewManager.ViewManager.ViewManager.receive?4(projectHash, fileName, command)
 eric6.ViewManager.ViewManager.ViewManager.removeSplit?4()
 eric6.ViewManager.ViewManager.ViewManager.replaceWidget?4()
 eric6.ViewManager.ViewManager.ViewManager.saveAllEditors?4()
@@ -9483,10 +9509,10 @@
 eric6.ViewManager.ViewManager.ViewManager.zoomValueChanged?4(value)
 eric6.ViewManager.ViewManager.ViewManager?1()
 eric6.ViewManager.factory?4(parent, ui, dbs, pluginManager)
-eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addCustomRule?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.addSubscription?4(subscription, refresh=True)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_adBlockGroup_toggled?4(state)
-eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_searchEdit_textChanged?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_subscriptionsTabWidget_currentChanged?4(index)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_updateSpinBox_valueChanged?4(value)
 eric6.WebBrowser.AdBlock.AdBlockDialog.AdBlockDialog.on_useLimitedEasyListCheckBox_clicked?4(checked)
@@ -9559,10 +9585,10 @@
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
-eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filter)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filterRule)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.subscription?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
-eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule?1(filter="", subscription=None)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule?1(filterRule="", subscription=None)
 eric6.WebBrowser.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
@@ -9594,7 +9620,7 @@
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.updateNow?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.url?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription?1(url, custom, parent=None, default=False)
-eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filter="")
+eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.addRule?4(filterRule="")
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.keyPressEvent?4(evt)
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.refresh?4()
 eric6.WebBrowser.AdBlock.AdBlockTreeWidget.AdBlockTreeWidget.removeRule?4()
@@ -9633,7 +9659,7 @@
 eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.columnCount?4(parent)
 eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsColumn?4(sourceColumn, sourceParent)
 eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.filterAcceptsRow?4(sourceRow, sourceParent)
-eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent=QModelIndex())
+eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel.hasChildren?4(parent=None)
 eric6.WebBrowser.Bookmarks.AddBookmarkDialog.AddBookmarkProxyModel?1(parent=None)
 eric6.WebBrowser.Bookmarks.BookmarkNode.BookmarkNode.Bookmark?7
 eric6.WebBrowser.Bookmarks.BookmarkNode.BookmarkNode.Folder?7
@@ -9670,44 +9696,44 @@
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(id="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.BookmarksImporter.BookmarksImporter?1(sourceId="", parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.ChromeImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.FirefoxImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.FirefoxImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.HtmlImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.HtmlImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.IExplorerImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.IExplorerImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.OperaImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.OperaImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.SafariImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.SafariImporter.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.importedBookmarks?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.open?4()
 eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter.setPath?4(path)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(id="", parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(id)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporter?4(id, parent=None)
-eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporterInfo?4(id)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.XbelImporter?1(sourceId="", parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.XbelImporter.getImporterInfo?4(sourceId)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporter?4(sourceId, parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporterInfo?4(sourceId)
 eric6.WebBrowser.Bookmarks.BookmarksImporters.getImporters?4()
 eric6.WebBrowser.Bookmarks.BookmarksManager.BOOKMARKBAR?7
 eric6.WebBrowser.Bookmarks.BookmarksManager.BOOKMARKMENU?7
@@ -9772,23 +9798,23 @@
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.UrlStringRole?7
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.VisitCountRole?7
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.bookmarksManager?4()
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.columnCount?4(parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.data?4(index, role=Qt.DisplayRole)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.dropMimeData?4(data, action, row, column, parent)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.entryAdded?4(node)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.entryChanged?4(node)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.entryRemoved?4(parent, row, node)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.flags?4(index)
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent=QModelIndex())
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.hasChildren?4(parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent=QModelIndex())
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.index?4(row, column, parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.mimeData?4(indexes)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.mimeTypes?4()
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.node?4(index)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.nodeIndex?4(node)
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index=QModelIndex())
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.parent?4(index=None)
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.rowCount?4(parent=None)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.setData?4(index, value, role=Qt.EditRole)
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel.supportedDropActions?4()
 eric6.WebBrowser.Bookmarks.BookmarksModel.BookmarksModel?1(manager, parent=None)
@@ -9813,7 +9839,7 @@
 eric6.WebBrowser.Bookmarks.XbelReader.XmlEntityResolver.resolveUndeclaredEntity?4(entity)
 eric6.WebBrowser.Bookmarks.XbelWriter.XbelWriter.write?4(fileNameOrDevice, root)
 eric6.WebBrowser.Bookmarks.XbelWriter.XbelWriter?1()
-eric6.WebBrowser.ClosedTabsManager.ClosedTab?1(url=QUrl(), title="", position=-1)
+eric6.WebBrowser.ClosedTabsManager.ClosedTab?1(url=None, title="", position=-1)
 eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.allClosedTabs?4()
 eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.clearList?4()
 eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.closedTabAvailable?7
@@ -9822,11 +9848,11 @@
 eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager.recordBrowser?4(browser, position)
 eric6.WebBrowser.ClosedTabsManager.ClosedTabsManager?1(parent=None)
 eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.addRule?4(host, rule)
-eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.columnCount?4(parent=None)
 eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.data?4(index, role)
 eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.headerData?4(section, orientation, role)
-eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel.rowCount?4(parent=None)
 eric6.WebBrowser.CookieJar.CookieExceptionsModel.CookieExceptionsModel?1(cookieJar, parent=None)
 eric6.WebBrowser.CookieJar.CookieJar.CookieJar.AcceptAlways?7
 eric6.WebBrowser.CookieJar.CookieJar.CookieJar.AcceptMax?7
@@ -9926,8 +9952,8 @@
 eric6.WebBrowser.Download.DownloadModel.DownloadModel.data?4(index, role)
 eric6.WebBrowser.Download.DownloadModel.DownloadModel.flags?4(index)
 eric6.WebBrowser.Download.DownloadModel.DownloadModel.mimeData?4(indexes)
-eric6.WebBrowser.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.Download.DownloadModel.DownloadModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.Download.DownloadModel.DownloadModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.Download.DownloadModel.DownloadModel.rowCount?4(parent=None)
 eric6.WebBrowser.Download.DownloadModel.DownloadModel?1(manager, parent=None)
 eric6.WebBrowser.Download.DownloadUtilities.dataString?4(size)
 eric6.WebBrowser.Download.DownloadUtilities.timeString?4(timeRemaining)
@@ -9982,7 +10008,7 @@
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_addWhiteButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_blackList_itemSelectionChanged?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_cookiesList_currentItemChanged?4(current, previous)
-eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filter)
+eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_filterEdit_textChanged?4(filterStr)
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_reloadButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeAllButton_clicked?4()
 eric6.WebBrowser.FlashCookieManager.FlashCookieManagerDialog.FlashCookieManagerDialog.on_removeBlackButton_clicked?4()
@@ -10106,18 +10132,18 @@
 eric6.WebBrowser.History.HistoryFilterModel.HistoryData?1(offset, frequency=0)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.FrequencyRole?7
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.MaxRole?7
-eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.columnCount?4(parent=None)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.data?4(index, role=Qt.DisplayRole)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.headerData?4(section, orientation, role=Qt.DisplayRole)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.historyContains?4(url)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.historyLocation?4(url)
-eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent=QModelIndex())
+eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.index?4(row, column, parent=None)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.mapFromSource?4(sourceIndex)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.mapToSource?4(proxyIndex)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.parent?4(index)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.recalculateFrequencies?4()
-eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.rowCount?4(parent=None)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel.setSourceModel?4(sourceModel)
 eric6.WebBrowser.History.HistoryFilterModel.HistoryFilterModel?1(sourceModel, parent=None)
 eric6.WebBrowser.History.HistoryManager.HISTORY_VERSION?7
@@ -10157,13 +10183,13 @@
 eric6.WebBrowser.History.HistoryMenu.HistoryMenu?1(parent=None, tabWidget=None)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.MOVEDROWS?7
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.bumpedRows?4()
-eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent=QModelIndex())
-eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent=QModelIndex())
+eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.columnCount?4(parent=None)
+eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.index?4(row, column, parent=None)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.mapFromSource?4(sourceIndex)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.mapToSource?4(proxyIndex)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.mimeData?4(indexes)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.parent?4(index)
-eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel.rowCount?4(parent=None)
 eric6.WebBrowser.History.HistoryMenu.HistoryMenuModel?1(sourceModel, parent=None)
 eric6.WebBrowser.History.HistoryMenu.HistoryMostVisitedMenu.newBackgroundTab?7
 eric6.WebBrowser.History.HistoryMenu.HistoryMostVisitedMenu.newPrivateWindow?7
@@ -10180,26 +10206,26 @@
 eric6.WebBrowser.History.HistoryModel.HistoryModel.TitleRole?7
 eric6.WebBrowser.History.HistoryModel.HistoryModel.UrlRole?7
 eric6.WebBrowser.History.HistoryModel.HistoryModel.UrlStringRole?7
-eric6.WebBrowser.History.HistoryModel.HistoryModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryModel.HistoryModel.columnCount?4(parent=None)
 eric6.WebBrowser.History.HistoryModel.HistoryModel.data?4(index, role=Qt.DisplayRole)
 eric6.WebBrowser.History.HistoryModel.HistoryModel.entryAdded?4()
 eric6.WebBrowser.History.HistoryModel.HistoryModel.entryUpdated?4(row)
 eric6.WebBrowser.History.HistoryModel.HistoryModel.headerData?4(section, orientation, role=Qt.DisplayRole)
 eric6.WebBrowser.History.HistoryModel.HistoryModel.historyReset?4()
-eric6.WebBrowser.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.History.HistoryModel.HistoryModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryModel.HistoryModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.History.HistoryModel.HistoryModel.rowCount?4(parent=None)
 eric6.WebBrowser.History.HistoryModel.HistoryModel?1(historyManager, parent=None)
-eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.columnCount?4(parent=None)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.data?4(index, role=Qt.DisplayRole)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.flags?4(index)
-eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.hasChildren?4(parent=None)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent=QModelIndex())
+eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.index?4(row, column, parent=None)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.mapFromSource?4(sourceIndex)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.mapToSource?4(proxyIndex)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.parent?4(index)
-eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.rowCount?4(parent=None)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel.setSourceModel?4(sourceModel)
 eric6.WebBrowser.History.HistoryTreeModel.HistoryTreeModel?1(sourceModel, parent=None)
 eric6.WebBrowser.ImageSearch.ImageSearchEngine.ImageSearchEngine.getSearchQuery?4(imageUrl, searchEngine=None)
@@ -10311,12 +10337,12 @@
 eric6.WebBrowser.OpenSearch.OpenSearchEngine.OpenSearchEngine.suggestionsUrlTemplate?4()
 eric6.WebBrowser.OpenSearch.OpenSearchEngine.OpenSearchEngine?1(parent=None)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineAction.OpenSearchEngineAction?1(engine, parent=None)
-eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.columnCount?4(parent=None)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.data?4(index, role)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.flags?4(index)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.rowCount?4(parent=None)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel.setData?4(index, value, role=Qt.EditRole)
 eric6.WebBrowser.OpenSearch.OpenSearchEngineModel.OpenSearchEngineModel?1(manager, parent=None)
 eric6.WebBrowser.OpenSearch.OpenSearchManager.OpenSearchManager.addEngine?4(engine)
@@ -10371,11 +10397,11 @@
 eric6.WebBrowser.Passwords.PasswordManager.PasswordManager.siteInfo?4(site)
 eric6.WebBrowser.Passwords.PasswordManager.PasswordManager.sitesCount?4()
 eric6.WebBrowser.Passwords.PasswordManager.PasswordManager?1(parent=None)
-eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.columnCount?4(parent=None)
 eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.data?4(index, role)
 eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.rowCount?4(parent=None)
 eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.setShowPasswords?4(on)
 eric6.WebBrowser.Passwords.PasswordModel.PasswordModel.showPasswords?4()
 eric6.WebBrowser.Passwords.PasswordModel.PasswordModel?1(manager, parent=None)
@@ -10766,11 +10792,11 @@
 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager.userAgentSettingsSaved?7
 eric6.WebBrowser.UserAgent.UserAgentManager.UserAgentManager?1(parent=None)
 eric6.WebBrowser.UserAgent.UserAgentMenu.UserAgentMenu?1(title, url=None, parent=None)
-eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.columnCount?4(parent=None)
 eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.data?4(index, role)
 eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel.rowCount?4(parent=None)
 eric6.WebBrowser.UserAgent.UserAgentModel.UserAgentModel?1(manager, parent=None)
 eric6.WebBrowser.UserAgent.UserAgentReader.UserAgentReader.read?4(fileNameOrDevice)
 eric6.WebBrowser.UserAgent.UserAgentReader.UserAgentReader?1()
@@ -11071,11 +11097,11 @@
 eric6.WebBrowser.ZoomManager.ZoomManager._ZoomManager?8
 eric6.WebBrowser.ZoomManager.ZoomManager.instance?4()
 eric6.WebBrowser.ZoomManager.ZoomValuesDialog.ZoomValuesDialog?1(parent=None)
-eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.columnCount?4(parent=QModelIndex())
+eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.columnCount?4(parent=None)
 eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.data?4(index, role)
 eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.headerData?4(section, orientation, role=Qt.DisplayRole)
-eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.removeRows?4(row, count, parent=QModelIndex())
-eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.rowCount?4(parent=QModelIndex())
+eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.removeRows?4(row, count, parent=None)
+eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel.rowCount?4(parent=None)
 eric6.WebBrowser.ZoomManager.ZoomValuesModel.ZoomValuesModel?1(manager, parent=None)
 eric6.cleanupSource.cleanupSource?4(dirName)
 eric6.cleanupSource.main?4(argv)
@@ -11146,7 +11172,7 @@
 eric6.eric6config.getConfig?4(name)
 eric6.install-debugclients.cleanUp?4()
 eric6.install-debugclients.cleanupSource?4(dirName)
-eric6.install-debugclients.copyTree?4(src, dst, filters, excludeDirs=[], excludePatterns=[])
+eric6.install-debugclients.copyTree?4(src, dst, filters, excludeDirs=None, excludePatterns=None)
 eric6.install-debugclients.currDir?7
 eric6.install-debugclients.distDir?7
 eric6.install-debugclients.doCleanup?7
@@ -11183,7 +11209,7 @@
 eric6.install.copyAppStreamFile?4(src, dst, marker)
 eric6.install.copyDesktopFile?4(src, dst, marker)
 eric6.install.copyToFile?4(name, text)
-eric6.install.copyTree?4(src, dst, filters, excludeDirs=[], excludePatterns=[])
+eric6.install.copyTree?4(src, dst, filters, excludeDirs=None, excludePatterns=None)
 eric6.install.createConfig?4()
 eric6.install.createGlobalPluginsDir?4()
 eric6.install.createInstallConfig?4()
--- a/APIs/Python3/eric6.bas	Thu Mar 23 18:58:56 2017 +0100
+++ b/APIs/Python3/eric6.bas	Fri Apr 07 18:33:59 2017 +0200
@@ -77,6 +77,7 @@
 ClickToFlashWhitelistDialog QDialog Ui_ClickToFlashWhitelistDialog
 ClosedTabsManager QObject
 CodeMetricsDialog QDialog Ui_CodeMetricsDialog
+CodeStyleAddBuiltinIgnoreDialog QDialog Ui_CodeStyleAddBuiltinIgnoreDialog
 CodeStyleCheckerDialog QDialog Ui_CodeStyleCheckerDialog
 CodeStyleCheckerPlugin QObject
 CodeStyleCheckerReport pycodestyle.BaseReport
@@ -405,6 +406,7 @@
 HgUnshelveDataDialog QDialog Ui_HgUnshelveDataDialog
 HgUserConfigDialog QDialog Ui_HgUserConfigDialog
 HgUserConfigHostFingerprintDialog QDialog Ui_HgUserConfigHostFingerprintDialog
+HgUserConfigHostMinimumProtocolDialog QDialog Ui_HgUserConfigHostMinimumProtocolDialog
 HighlightingStylesReader XMLStreamReaderBase
 HighlightingStylesWriter XMLStreamWriterBase
 Histedit HgExtension
@@ -504,6 +506,7 @@
 LexerYAML Lexer QsciLexerYAML
 LfConvertDataDialog QDialog Ui_LfConvertDataDialog
 LfRevisionsInputDialog QDialog Ui_LfRevisionsInputDialog
+LineComplexityVisitor ast.NodeVisitor
 ListResolver BaseResolver
 Listspace ViewManager
 LogViewer QWidget
--- a/Cooperation/ChatWidget.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Cooperation/ChatWidget.py	Fri Apr 07 18:33:59 2017 +0200
@@ -33,7 +33,7 @@
     
     @signal connected(connected) emitted to signal a change of the connected
             state (bool)
-    @signal editorCommand(hash, filename, message) emitted when an editor
+    @signal editorCommand(hashStr, filename, message) emitted when an editor
             command has been received (string, string, string)
     @signal shareEditor(share) emitted to signal a share is requested (bool)
     @signal startEdit() emitted to start a shared edit session
@@ -391,15 +391,15 @@
         """
         return self.__client
     
-    def __editorCommandMessage(self, hash, fileName, message):
+    def __editorCommandMessage(self, hashStr, fileName, message):
         """
         Private slot to handle editor command messages from the client.
         
-        @param hash hash of the project (string)
+        @param hashStr hash of the project (string)
         @param fileName project relative file name of the editor (string)
         @param message command message (string)
         """
-        self.editorCommand.emit(hash, fileName, message)
+        self.editorCommand.emit(hashStr, fileName, message)
         
         from QScintilla.Editor import Editor
         if message.startswith(Editor.StartEditToken + Editor.Separator) or \
--- a/Cooperation/Connection.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Cooperation/Connection.py	Fri Apr 07 18:33:59 2017 +0200
@@ -398,9 +398,9 @@
                 participantsList = msg.split(SeparatorToken)
             self.participants.emit(participantsList[:])
         elif self.__currentDataType == Connection.Editor:
-            hash, fn, msg = \
+            hashStr, fn, msg = \
                 str(self.__buffer, encoding="utf-8").split(SeparatorToken)
-            self.editorCommand.emit(hash, fn, msg)
+            self.editorCommand.emit(hashStr, fn, msg)
         
         self.__currentDataType = Connection.Undefined
         self.__numBytesForCurrentDataType = 0
--- a/DataViews/CodeMetrics.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DataViews/CodeMetrics.py	Fri Apr 07 18:33:59 2017 +0200
@@ -85,7 +85,8 @@
                 else:
                     self.__addToken(toktype, toktext, srow, scol, line)
         except tokenize.TokenError as msg:
-            print("Token Error: {0}".format(str(msg)))  # __IGNORE_WARNING__
+            print("Token Error: {0}".format(str(msg)))
+            # __IGNORE_WARNING_M801__
             return
         
         return
@@ -170,19 +171,19 @@
         @param key the key to be incremented
         @param value the increment (int)
         """
-        for id, level, row in self.active:
-            counters = self.counters.setdefault(id, {})
+        for counterId, level, row in self.active:
+            counters = self.counters.setdefault(counterId, {})
             counters[key] = counters.setdefault(key, 0) + value
 
-    def getCounter(self, id, key):
+    def getCounter(self, counterId, key):
         """
         Public method used to get a specific counter value.
         
-        @param id id of the counter (string)
+        @param counterId id of the counter (string)
         @param key key of the value to be retrieved (string)
         @return the value of the requested counter (int)
         """
-        return self.counters.get(id, {}).get(key, 0)
+        return self.counters.get(counterId, {}).get(key, 0)
 
 
 def summarize(total, key, value):
--- a/DataViews/CodeMetricsDialog.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DataViews/CodeMetricsDialog.py	Fri Apr 07 18:33:59 2017 +0200
@@ -270,9 +270,9 @@
                                    self.__data)
         filterList = filterString.split(",")
         if filterList:
-            for filter in filterList:
+            for filterString in filterList:
                 fileList = [f for f in fileList
-                            if not fnmatch.fnmatch(f, filter.strip())]
+                            if not fnmatch.fnmatch(f, filterString.strip())]
         
         self.resultList.clear()
         self.summaryList.clear()
--- a/DebugClients/Python/DebugBase.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DebugClients/Python/DebugBase.py	Fri Apr 07 18:33:59 2017 +0200
@@ -65,6 +65,9 @@
 
     # cache for fixed file names
     _fnCache = {}
+    
+    # Stop all timers, when greenlets are used
+    pollTimerEnabled = True
 
     def __init__(self, dbgClient):
         """
@@ -112,9 +115,11 @@
         """
         Private method to set a flag every 0.5 s to check for new messages.
         """
-        while True:
+        while DebugBase.pollTimerEnabled:
             time.sleep(0.5)
             self.eventPollFlag = True
+        
+        self.eventPollFlag = False
     
     def getCurrentFrame(self):
         """
@@ -357,7 +362,7 @@
         if event == 'c_return':
             return
         
-        print('DebugBase.trace_dispatch:'       # __IGNORE_WARNING__
+        print('DebugBase.trace_dispatch:'       # __IGNORE_WARNING_M801__
               ' unknown debugging event: ',
               repr(event))
         return self.trace_dispatch
@@ -421,25 +426,25 @@
             sys.settrace(None)
             sys.setprofile(None)
     
-    def run(self, cmd, globals=None, locals=None, debug=True):
+    def run(self, cmd, globalsDict=None, localsDict=None, debug=True):
         """
         Public method to start a given command under debugger control.
         
         @param cmd command / code to execute under debugger control
         @type str or CodeType
-        @keyparam globals dictionary of global variables for cmd
+        @keyparam globalsDict dictionary of global variables for cmd
         @type dict
-        @keyparam locals dictionary of local variables for cmd
+        @keyparam localsDict dictionary of local variables for cmd
         @type dict
         @keyparam debug flag if command should run under debugger control
         @type bool
         """
-        if globals is None:
+        if globalsDict is None:
             import __main__
-            globals = __main__.__dict__
+            globalsDict = __main__.__dict__
         
-        if locals is None:
-            locals = globals
+        if localsDict is None:
+            localsDict = globalsDict
         
         if not isinstance(cmd, types.CodeType):
             cmd = compile(cmd, "<string>", "exec")
@@ -452,7 +457,7 @@
             sys.settrace(self.trace_dispatch)
         
         try:
-            exec(cmd, globals, locals)
+            exec(cmd, globalsDict, localsDict)
             atexit._run_exitfuncs()
             self._dbgClient.progTerminated(0)
         except SystemExit:
@@ -524,6 +529,20 @@
         @type frame object
         """
         self._set_stopinfo(None, frame.f_back)
+    
+    def move_instruction_pointer(self, lineno):
+        """
+        Public methode to move the instruction pointer to another line.
+        
+        @param lineno new line number
+        @type int
+        """
+        try:
+            self.currentFrame.f_lineno = lineno
+            stack = self.getStack(self.currentFrame)
+            self._dbgClient.sendResponseLine(stack)
+        except Exception as e:
+            printerr(e)
 
     def set_quit(self):
         """
@@ -562,16 +581,13 @@
         try:
             return self._fnCache[fn]
         except KeyError:
-            if fn and fn != frame.f_code.co_filename:
-                absFilename = os.path.abspath(fn)
-                if absFilename.endswith(('.pyc', '.pyo')):
-                    fixedName = absFilename[:-1]
-                    if not os.path.exists(fixedName):
-                        fixedName = absFilename
-                else:
+            absFilename = os.path.abspath(fn)
+            if absFilename.endswith(('.pyc', '.pyo')):
+                fixedName = absFilename[:-1]
+                if not os.path.exists(fixedName):
                     fixedName = absFilename
             else:
-                fixedName = frame.f_code.co_filename
+                fixedName = absFilename
             # update cache
             self._fnCache[fn] = fixedName
             return fixedName
@@ -792,12 +808,16 @@
                     filename = excval.filename
                     lineno = excval.lineno
                     charno = excval.offset
-
-                if charno is None:
-                    charno = 0
                 
-                filename = os.path.abspath(filename)
-                realSyntaxError = os.path.exists(filename)
+                if filename is None:
+                    realSyntaxError = False
+                else:
+                    if charno is None:
+                        charno = 0
+                    
+                    filename = os.path.abspath(filename)
+                    realSyntaxError = os.path.exists(filename)
+                
             except (AttributeError, ValueError):
                 message = ""
                 filename = ""
--- a/DebugClients/Python/DebugClientBase.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DebugClients/Python/DebugClientBase.py	Fri Apr 07 18:33:59 2017 +0200
@@ -179,7 +179,7 @@
     clientCapabilities = DebugClientCapabilities.HasAll
     
     # keep these in sync with VariablesViewer.VariableItem.Indicators
-    Indicators = ("()", "[]", "{:}", "{}")         # __IGNORE_WARNING__
+    Indicators = ("()", "[]", "{:}", "{}")      # __IGNORE_WARNING_M613__
     
     def __init__(self):
         """
@@ -223,9 +223,6 @@
         
         self.variant = 'You should not see this'
         
-        # commandline completion stuff
-        self.complete = Completer(self.debugMod.__dict__).complete
-        
         self.compile_command = codeop.CommandCompiler()
         
         self.coding_re = re.compile(r"coding[:=]\s*([-\w_.]+)")
@@ -292,12 +289,12 @@
         """
         return eval(self.raw_input(prompt, True))
         
-    def sessionClose(self, exit=True):
+    def sessionClose(self, terminate=True):
         """
         Public method to close the session with the debugger and optionally
         terminate.
         
-        @param exit flag indicating to terminate (boolean)
+        @param terminate flag indicating to terminate (boolean)
         """
         try:
             self.set_quit()
@@ -313,7 +310,7 @@
         self.writestream.close(True)
         self.errorstream.close(True)
 
-        if exit:
+        if terminate:
             # Ok, go away.
             sys.exit()
 
@@ -726,6 +723,10 @@
                 self.set_quit()
                 self.eventExit = True
         
+        elif method == "RequestMoveIP":
+            newLine = params["newLine"]
+            self.currentThreadExec.move_instruction_pointer(newLine)
+        
         elif method == "RequestContinue":
             self.currentThreadExec.go(params["special"])
             self.eventExit = True
@@ -1320,14 +1321,14 @@
         # reset coding
         self.__coding = self.defaultCoding
 
-    def __dumpVariables(self, frmnr, scope, filter):
+    def __dumpVariables(self, frmnr, scope, filterList):
         """
         Private method to return the variables of a frame to the debug server.
         
         @param frmnr distance of frame reported on. 0 is the current frame
             (int)
         @param scope 1 to report global variables, 0 for local variables (int)
-        @param filter the indices of variable types to be filtered
+        @param filterList the indices of variable types to be filtered
             (list of int)
         """
         if self.currentThread is None:
@@ -1345,22 +1346,23 @@
         
         if f is None:
             if scope:
-                dict = self.debugMod.__dict__
+                varDict = self.debugMod.__dict__
             else:
                 scope = -1
         elif scope:
-            dict = f.f_globals
+            varDict = f.f_globals
         elif f.f_globals is f.f_locals:
                 scope = -1
         else:
-            dict = f.f_locals
+            varDict = f.f_locals
             
         varlist = []
         
         if scope != -1:
-            keylist = dict.keys()
+            keylist = varDict.keys()
             
-            vlist = self.__formatVariablesList(keylist, dict, scope, filter)
+            vlist = self.__formatVariablesList(
+                keylist, varDict, scope, filterList)
             varlist.extend(vlist)
         
         self.sendJsonCommand("ResponseVariables", {
@@ -1368,7 +1370,7 @@
             "variables": varlist,
         })
     
-    def __dumpVariable(self, var, frmnr, scope, filter):
+    def __dumpVariable(self, var, frmnr, scope, filterList):
         """
         Private method to return the variables of a frame to the debug server.
         
@@ -1377,7 +1379,7 @@
         @param frmnr distance of frame reported on. 0 is the current frame
             (int)
         @param scope 1 to report global variables, 0 for local variables (int)
-        @param filter the indices of variable types to be filtered
+        @param filterList the indices of variable types to be filtered
             (list of int)
         """
         if self.currentThread is None:
@@ -1392,20 +1394,20 @@
         
         if f is None:
             if scope:
-                dict = self.debugMod.__dict__
+                varDict = self.debugMod.__dict__
             else:
                 scope = -1
         elif scope:
-            dict = f.f_globals
+            varDict = f.f_globals
         elif f.f_globals is f.f_locals:
                 scope = -1
         else:
-            dict = f.f_locals
+            varDict = f.f_locals
         
         varlist = []
         
         if scope != -1:
-            variable = dict
+            variable = varDict
             for attribute in var:
                 attribute = self.__extractIndicators(attribute)[0]
                 typeObject, typeName, typeStr, resolver = \
@@ -1425,9 +1427,9 @@
                     vlist = self.__formatQtVariable(variable, typeName)
                     varlist.extend(vlist)
                 elif resolver:
-                    dict = resolver.getDictionary(variable)
+                    varDict = resolver.getDictionary(variable)
                     vlist = self.__formatVariablesList(
-                        list(dict.keys()), dict, scope, filter)
+                        list(varDict.keys()), varDict, scope, filterList)
                     varlist.extend(vlist)
         
         self.sendJsonCommand("ResponseVariable", {
@@ -1597,7 +1599,7 @@
             
         return varlist
     
-    def __formatVariablesList(self, keylist, dict_, scope, filter=[],
+    def __formatVariablesList(self, keylist, dict_, scope, filterList=None,
                               formatSequences=False):
         """
         Private method to produce a formated variables list.
@@ -1614,9 +1616,9 @@
             filter (int).
             Variables are only added to the list, if their name do not match
             any of the filter expressions.
-        @param filter the indices of variable types to be filtered. Variables
-            are only added to the list, if their type is not contained in the
-            filter list.
+        @param filterList the indices of variable types to be filtered.
+            Variables are only added to the list, if their type is not
+            contained in the filter list.
         @param formatSequences flag indicating, that sequence or dictionary
             variables should be formatted. If it is 0 (or false), just the
             number of items contained in these variables is returned. (boolean)
@@ -1624,6 +1626,8 @@
             variable entry is a tuple of three elements, the variable name,
             its type and value.
         """
+        filterList = [] if filterList is None else filterList[:]
+        
         varlist = []
         if scope:
             patternFilterObjects = self.globalsFilterObjects
@@ -1641,7 +1645,7 @@
                 continue
             
             # filter hidden attributes (filter #0)
-            if 0 in filter and str(key)[:2] == '__' and not (
+            if 0 in filterList and str(key)[:2] == '__' and not (
                 key == "___len___" and
                     DebugVariables.TooLargeAttribute in keylist):
                 continue
@@ -1658,19 +1662,19 @@
                 valtypename = type(value).__name__
                 if valtype not in ConfigVarTypeStrings:
                     if valtype in ["numpy.ndarray", "array.array"]:
-                        if ConfigVarTypeStrings.index('list') in filter:
+                        if ConfigVarTypeStrings.index('list') in filterList:
                             continue
                     elif valtypename == "MultiValueDict":
-                        if ConfigVarTypeStrings.index('dict') in filter:
+                        if ConfigVarTypeStrings.index('dict') in filterList:
                             continue
                     elif valtype == "sip.methoddescriptor":
                         if ConfigVarTypeStrings.index(
-                                'method') in filter:
+                                'method') in filterList:
                             continue
                     elif valtype == "sip.enumtype":
-                        if ConfigVarTypeStrings.index('class') in filter:
+                        if ConfigVarTypeStrings.index('class') in filterList:
                             continue
-                    elif ConfigVarTypeStrings.index('instance') in filter:
+                    elif ConfigVarTypeStrings.index('instance') in filterList:
                         continue
                     
                     if (not valtypestr.startswith('type ') and
@@ -1683,22 +1687,24 @@
                         if valtype == "instancemethod":
                             valtype = "method"
                         
-                        if ConfigVarTypeStrings.index(valtype) in filter:
+                        if ConfigVarTypeStrings.index(valtype) in filterList:
                             continue
                     except ValueError:
                         if valtype == "classobj":
                             if ConfigVarTypeStrings.index(
-                                    'instance') in filter:
+                                    'instance') in filterList:
                                 continue
                         elif valtype == "sip.methoddescriptor":
                             if ConfigVarTypeStrings.index(
-                                    'method') in filter:
+                                    'method') in filterList:
                                 continue
                         elif valtype == "sip.enumtype":
-                            if ConfigVarTypeStrings.index('class') in filter:
+                            if ConfigVarTypeStrings.index('class') in \
+                                    filterList:
                                 continue
                         elif not valtype.startswith("PySide") and \
-                                ConfigVarTypeStrings.index('other') in filter:
+                            (ConfigVarTypeStrings.index('other') in
+                             filterList):
                             continue
                 
                 try:
@@ -1773,7 +1779,20 @@
             self.__getCompletionList(text, localCompleter, completions)
         except AttributeError:
             pass
-        self.__getCompletionList(text, self.complete, completions)
+        
+        cf = self.currentThread.getCurrentFrame()
+        frmnr = self.framenr
+        while cf is not None and frmnr > 0:
+            cf = cf.f_back
+            frmnr -= 1
+        
+        if cf is None:
+            globaldict = self.debugMod.__dict__
+        else:
+            globaldict = cf.f_globals
+        
+        globalCompleter = Completer(globaldict).complete
+        self.__getCompletionList(text, globalCompleter, completions)
         
         self.sendJsonCommand("ResponseCompletion", {
             "completions": list(completions),
@@ -2002,7 +2021,8 @@
                 else:   # unknown option
                     del args[0]
             if not args:
-                print("No program given. Aborting!")    # __IGNORE_WARNING__
+                print("No program given. Aborting!")
+                # __IGNORE_WARNING_M801__
             else:
                 if not self.noencoding:
                     self.__coding = self.defaultCoding
@@ -2043,7 +2063,8 @@
                 self.connectDebugger(port, remoteAddress, redirect)
                 self.__interact()
             else:
-                print("No network port given. Aborting...")     # __IGNORE_WARNING__
+                print("No network port given. Aborting...")
+                # __IGNORE_WARNING_M801__
         
     def fork(self):
         """
@@ -2061,13 +2082,13 @@
             if not self.fork_child:
                 sys.settrace(None)
                 sys.setprofile(None)
-                self.sessionClose(0)
+                self.sessionClose(False)
         else:
             # parent
             if self.fork_child:
                 sys.settrace(None)
                 sys.setprofile(None)
-                self.sessionClose(0)
+                self.sessionClose(False)
         return pid
         
     def close(self, fd):
--- a/DebugClients/Python/DebugUtilities.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DebugClients/Python/DebugUtilities.py	Fri Apr 07 18:33:59 2017 +0200
@@ -84,7 +84,7 @@
     return args, varargs, kwonlyargs, varkw
 
 
-def formatargvalues(args, varargs, varkw, locals,
+def formatargvalues(args, varargs, varkw, localsDict,
                     formatarg=str,
                     formatvarargs=lambda name: '*' + name,
                     formatvarkw=lambda name: '**' + name,
@@ -99,7 +99,7 @@
     @type str
     @param varkw name of the keyword arguments
     @type str
-    @param locals reference to the local variables dictionary
+    @param localsDict reference to the local variables dictionary
     @type dict
     @keyparam formatarg argument formatting function
     @type func
@@ -115,14 +115,14 @@
     specs = []
     for i in range(len(args)):
         name = args[i]
-        specs.append(formatarg(name) + formatvalue(locals[name]))
+        specs.append(formatarg(name) + formatvalue(localsDict[name]))
     if varargs:
-        specs.append(formatvarargs(varargs) + formatvalue(locals[varargs]))
+        specs.append(formatvarargs(varargs) + formatvalue(localsDict[varargs]))
     if varkw:
-        specs.append(formatvarkw(varkw) + formatvalue(locals[varkw]))
+        specs.append(formatvarkw(varkw) + formatvalue(localsDict[varkw]))
     argvalues = '(' + ', '.join(specs) + ')'
-    if '__return__' in locals:
-        argvalues += " -> " + formatvalue(locals['__return__'])
+    if '__return__' in localsDict:
+        argvalues += " -> " + formatvalue(localsDict['__return__'])
     return argvalues
 
 
--- a/DebugClients/Python/ThreadExtension.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/DebugClients/Python/ThreadExtension.py	Fri Apr 07 18:33:59 2017 +0200
@@ -39,6 +39,7 @@
         self._original_start_new_thread = None
         self.threadingAttached = False
         self.qtThreadAttached = False
+        self.greenlet = False
         
         self.clientLock = threading.RLock()
         
@@ -64,7 +65,7 @@
         
         sys.meta_path.insert(0, self)
 
-    def attachThread(self, target=None, args=None, kwargs={},
+    def attachThread(self, target=None, args=None, kwargs=None,
                      mainThread=False):
         """
         Public method to setup a standard thread for DebugClient to debug.
@@ -80,6 +81,9 @@
               started mainthread of the app
         @return identifier of the created thread
         """
+        if kwargs is None:
+            kwargs = {}
+        
         if mainThread:
             ident = _thread.get_ident()
             name = 'MainThread'
@@ -140,19 +144,19 @@
         except AssertionError:
             pass
     
-    def setCurrentThread(self, id):
+    def setCurrentThread(self, threadId):
         """
         Public method to set the current thread.
 
-        @param id the id the current thread should be set to.
+        @param threadId the id the current thread should be set to.
         @type int
         """
         try:
             self.lockClient()
-            if id is None:
+            if threadId is None:
                 self.currentThread = None
             else:
-                self.currentThread = self.threads.get(id)
+                self.currentThread = self.threads.get(threadId)
         finally:
             self.unlockClient()
     
@@ -167,10 +171,10 @@
             # update thread names set by user (threading.setName)
             threadNames = {t.ident: t.getName() for t in threading.enumerate()}
             
-            for id, thd in self.threads.items():
-                d = {"id": id}
+            for threadId, thd in self.threads.items():
+                d = {"id": threadId}
                 try:
-                    d["name"] = threadNames.get(id, thd.name)
+                    d["name"] = threadNames.get(threadId, thd.name)
                     d["broken"] = thd.isBroken
                 except Exception:
                     d["name"] = 'UnknownThread'
@@ -215,28 +219,28 @@
         Public method to update the list of running threads.
         """
         frames = sys._current_frames()
-        for id, frame in frames.items():
+        for threadId, frame in frames.items():
             # skip our own timer thread
             if frame.f_code.co_name == '__eventPollTimer':
                 continue
             
             # Unknown thread
-            if id not in self.threads:
+            if threadId not in self.threads:
                 newThread = DebugBase(self)
                 name = 'Thread-{0}'.format(self.threadNumber)
                 self.threadNumber += 1
                 
-                newThread.id = id
+                newThread.id = threadId
                 newThread.name = name
-                self.threads[id] = newThread
+                self.threads[threadId] = newThread
             
             # adjust current frame
             if "__pypy__" not in sys.builtin_module_names:
                 # Don't update with None
                 currentFrame = self.getExecutedFrame(frame)
                 if (currentFrame is not None and
-                        self.threads[id].isBroken is False):
-                    self.threads[id].currentFrame = currentFrame
+                        self.threads[threadId].isBroken is False):
+                    self.threads[threadId].currentFrame = currentFrame
         
         # Clean up obsolet because terminated threads
         self.threads = {id_: thrd for id_, thrd in self.threads.items()
@@ -257,7 +261,7 @@
             return None
         
         if fullname in [self.threadModName, 'PyQt4.QtCore', 'PyQt5.QtCore',
-                        'PySide.QtCore', 'PySide2.QtCore',
+                        'PySide.QtCore', 'PySide2.QtCore', 'greenlet',
                         'threading'] and self.enableImportHooks:
             # Disable hook to be able to import original module
             self.enableImportHooks = False
@@ -282,6 +286,14 @@
             self._original_start_new_thread = module.start_new_thread
             module.start_new_thread = self.attachThread
 
+        elif (fullname == 'greenlet' and self.greenlet is False):
+            # Check for greenlet.settrace
+            if hasattr(module, 'settrace'):
+                self.greenlet = True
+                DebugBase.pollTimerEnabled = False
+            
+            # TODO: Implement the debugger extension for greenlets
+        
         # Add hook for threading.run()
         elif (fullname == "threading" and self.threadingAttached is False):
             self.threadingAttached = True
@@ -297,7 +309,8 @@
                 @param run the run method of threading.Thread
                 @type method pointer
                 """
-                newThread = _debugClient.threads[self.ident]
+                newThread = DebugBase(_debugClient)
+                _debugClient.threads[self.ident] = newThread
                 newThread.name = self.name
                 # see DebugBase.bootstrap
                 sys.settrace(newThread.trace_dispatch)
--- a/Debugger/BreakPointModel.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/BreakPointModel.py	Fri Apr 07 18:33:59 2017 +0200
@@ -44,16 +44,16 @@
                            Qt.Alignment(Qt.AlignHCenter),
                            ]
 
-    def columnCount(self, parent=QModelIndex()):
+    def columnCount(self, parent=None):
         """
         Public method to get the current column count.
         
-        @param parent reference to parent index (QModelIndex)
+        @param parent reference to parent index (QModelIndex) (Unused)
         @return column count (integer)
         """
         return len(self.header)
     
-    def rowCount(self, parent=QModelIndex()):
+    def rowCount(self, parent=None):
         """
         Public method to get the current row count.
         
@@ -61,7 +61,7 @@
         @return row count (integer)
         """
         # we do not have a tree, parent should always be invalid
-        if not parent.isValid():
+        if parent is None or not parent.isValid():
             return len(self.breakpoints)
         else:
             return 0
@@ -143,7 +143,7 @@
         
         return None
     
-    def index(self, row, column, parent=QModelIndex()):
+    def index(self, row, column, parent=None):
         """
         Public method to create an index.
         
@@ -152,7 +152,7 @@
         @param parent index of the parent item (QModelIndex)
         @return requested index (QModelIndex)
         """
-        if parent.isValid() or \
+        if (parent and parent.isValid()) or \
            row < 0 or row >= len(self.breakpoints) or \
            column < 0 or column >= len(self.header):
             return QModelIndex()
@@ -168,14 +168,14 @@
         """
         return QModelIndex()
     
-    def hasChildren(self, parent=QModelIndex()):
+    def hasChildren(self, parent=None):
         """
         Public method to check for the presence of child items.
         
         @param parent index of parent item (QModelIndex)
         @return flag indicating the presence of child items (boolean)
         """
-        if not parent.isValid():
+        if parent is None or not parent.isValid():
             return len(self.breakpoints) > 0
         else:
             return False
--- a/Debugger/DebugServer.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebugServer.py	Fri Apr 07 18:33:59 2017 +0200
@@ -693,15 +693,15 @@
             self.__addWatchPoints(
                 QModelIndex(), startIndex.row(), endIndex.row())
         
-    def getClientCapabilities(self, type):
+    def getClientCapabilities(self, clientType):
         """
         Public method to retrieve the debug clients capabilities.
         
-        @param type debug client type (string)
+        @param clientType debug client type (string)
         @return debug client capabilities (integer)
         """
         try:
-            return self.__debuggerInterfaceRegistry[type][0]
+            return self.__debuggerInterfaceRegistry[clientType][0]
         except KeyError:
             return 0    # no capabilities
         
@@ -996,17 +996,27 @@
         """
         self.debuggerInterface.remoteContinue(special)
 
-    def remoteBreakpoint(self, fn, line, set, cond=None, temp=False):
+    def remoteMoveIP(self, line):
+        """
+        Public method to move the instruction pointer to a different line.
+        
+        @param line the new line, where execution should be continued
+        """
+        self.debuggerInterface.remoteMoveIP(line)
+
+    def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False):
         """
         Public method to set or clear a breakpoint.
         
         @param fn filename the breakpoint belongs to (string)
         @param line linenumber of the breakpoint (int)
-        @param set flag indicating setting or resetting a breakpoint (boolean)
+        @param setBreakpoint flag indicating setting or resetting a breakpoint
+            (boolean)
         @param cond condition of the breakpoint (string)
         @param temp flag indicating a temporary breakpoint (boolean)
         """
-        self.debuggerInterface.remoteBreakpoint(fn, line, set, cond, temp)
+        self.debuggerInterface.remoteBreakpoint(fn, line, setBreakpoint, cond,
+                                                temp)
         
     def __remoteBreakpointEnable(self, fn, line, enable):
         """
@@ -1029,17 +1039,17 @@
         """
         self.debuggerInterface.remoteBreakpointIgnore(fn, line, count)
         
-    def __remoteWatchpoint(self, cond, set, temp=False):
+    def __remoteWatchpoint(self, cond, setWatch, temp=False):
         """
         Private method to set or clear a watch expression.
         
         @param cond expression of the watch expression (string)
-        @param set flag indicating setting or resetting a watch expression
+        @param setWatch flag indicating setting or resetting a watch expression
             (boolean)
         @param temp flag indicating a temporary watch expression (boolean)
         """
         # cond is combination of cond and special (s. watch expression viewer)
-        self.debuggerInterface.remoteWatchpoint(cond, set, temp)
+        self.debuggerInterface.remoteWatchpoint(cond, setWatch, temp)
     
     def __remoteWatchpointEnable(self, cond, enable):
         """
@@ -1086,36 +1096,38 @@
         """
         self.debuggerInterface.remoteSetThread(tid)
         
-    def remoteClientVariables(self, scope, filter, framenr=0):
+    def remoteClientVariables(self, scope, filterList, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param framenr framenumber of the variables to retrieve (int)
         """
-        self.debuggerInterface.remoteClientVariables(scope, filter, framenr)
+        self.debuggerInterface.remoteClientVariables(scope, filterList,
+                                                     framenr)
         
-    def remoteClientVariable(self, scope, filter, var, framenr=0):
+    def remoteClientVariable(self, scope, filterList, var, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param var list encoded name of variable to retrieve (string)
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.debuggerInterface.remoteClientVariable(
-            scope, filter, var, framenr)
+            scope, filterList, var, framenr)
         
-    def remoteClientSetFilter(self, scope, filter):
+    def remoteClientSetFilter(self, scope, filterStr):
         """
         Public method to set a variables filter list.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter regexp string for variable names to filter out (string)
+        @param filterStr regexp string for variable names to filter out
+            (string)
         """
-        self.debuggerInterface.remoteClientSetFilter(scope, filter)
+        self.debuggerInterface.remoteClientSetFilter(scope, filterStr)
         
     def setCallTraceEnabled(self, on):
         """
@@ -1447,54 +1459,54 @@
         """
         self.utStopTest.emit()
         
-    def clientUtTestFailed(self, testname, traceback, id):
+    def clientUtTestFailed(self, testname, traceback, testId):
         """
         Public method to process the client test failed info.
         
         @param testname name of the test (string)
         @param traceback lines of traceback info (list of strings)
-        @param id id of the test (string)
+        @param testId id of the test (string)
         """
-        self.utTestFailed.emit(testname, traceback, id)
+        self.utTestFailed.emit(testname, traceback, testId)
         
-    def clientUtTestErrored(self, testname, traceback, id):
+    def clientUtTestErrored(self, testname, traceback, testId):
         """
         Public method to process the client test errored info.
         
         @param testname name of the test (string)
         @param traceback lines of traceback info (list of strings)
-        @param id id of the test (string)
+        @param testId id of the test (string)
         """
-        self.utTestErrored.emit(testname, traceback, id)
+        self.utTestErrored.emit(testname, traceback, testId)
         
-    def clientUtTestSkipped(self, testname, reason, id):
+    def clientUtTestSkipped(self, testname, reason, testId):
         """
         Public method to process the client test skipped info.
         
         @param testname name of the test (string)
         @param reason reason for skipping the test (string)
-        @param id id of the test (string)
+        @param testId id of the test (string)
         """
-        self.utTestSkipped.emit(testname, reason, id)
+        self.utTestSkipped.emit(testname, reason, testId)
         
-    def clientUtTestFailedExpected(self, testname, traceback, id):
+    def clientUtTestFailedExpected(self, testname, traceback, testId):
         """
         Public method to process the client test failed expected info.
         
         @param testname name of the test (string)
         @param traceback lines of traceback info (list of strings)
-        @param id id of the test (string)
+        @param testId id of the test (string)
         """
-        self.utTestFailedExpected.emit(testname, traceback, id)
+        self.utTestFailedExpected.emit(testname, traceback, testId)
         
-    def clientUtTestSucceededUnexpected(self, testname, id):
+    def clientUtTestSucceededUnexpected(self, testname, testId):
         """
         Public method to process the client test succeeded unexpected info.
         
         @param testname name of the test (string)
-        @param id id of the test (string)
+        @param testId id of the test (string)
         """
-        self.utTestSucceededUnexpected.emit(testname, id)
+        self.utTestSucceededUnexpected.emit(testname, testId)
         
     def clientUtFinished(self):
         """
--- a/Debugger/DebugUI.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebugUI.py	Fri Apr 07 18:33:59 2017 +0200
@@ -109,7 +109,7 @@
         self.lastAction = -1
         self.debugActions = [
             self.__continue, self.__step, self.__stepOver, self.__stepOut,
-            self.__stepQuit, self.__runToCursor
+            self.__stepQuit, self.__runToCursor, self.__moveInstructionPointer
         ]
         self.localsVarFilter, self.globalsVarFilter = \
             Preferences.getVarFilters()
@@ -357,6 +357,26 @@
         ))
         act.triggered.connect(self.__runToCursor)
         self.actions.append(act)
+        
+        act = E5Action(
+            self.tr('Move Instruction Pointer to Cursor'),
+            UI.PixmapCache.getIcon("moveInstructionPointer.png"),
+            self.tr('&Jump To Cursor'), Qt.Key_F12, 0,
+            self.debugActGrp, 'dbg_jump_to_cursor')
+        act.setStatusTip(self.tr(
+            """Skip the code from the"""
+            """ current line to the current cursor position"""))
+        act.setWhatsThis(self.tr(
+            """<b>Move Instruction Pointer to Cursor</b>"""
+            """<p>Move the Python internal instruction pointer to the"""
+            """ current cursor position without executing the code in"""
+            """ between.</p>"""
+            """<p>It's not possible to jump out of a function or jump"""
+            """ in a code block, e.g. a loop. In these cases, a error"""
+            """ message is printed to the log window.</p>"""
+        ))
+        act.triggered.connect(self.__moveInstructionPointer)
+        self.actions.append(act)
 
         act = E5Action(
             self.tr('Single Step'),
@@ -1119,10 +1139,16 @@
                     file, line = stackTrace[0][:2]
                     source, encoding = Utilities.readEncodedFile(file)
                     source = source.splitlines(True)
-                    if len(source) >= line and \
-                       "__IGNORE_EXCEPTION__" in Utilities.extractLineFlags(
-                            source[line - 1]):
-                        res = E5MessageBox.No
+                    if len(source) >= line:
+                        lineFlags = Utilities.extractLineFlags(
+                            source[line - 1].strip())
+                        try:
+                            lineFlags += Utilities.extractLineFlags(
+                                source[line].strip(), flagsLine=True)
+                        except IndexError:
+                            pass
+                        if "__IGNORE_EXCEPTION__" in lineFlags:
+                            res = E5MessageBox.No
                 except (UnicodeError, IOError):
                     pass
                 if res != E5MessageBox.No:
@@ -1279,9 +1305,9 @@
         @param variables the list of members of a classvariable from the client
         """
         if scope == 1:
-            self.debugViewer.showVariable(variables, 1)
+            self.debugViewer.showVariable(variables, True)
         elif scope == 0:
-            self.debugViewer.showVariable(variables, 0)
+            self.debugViewer.showVariable(variables, False)
             
     def __clientBreakConditionError(self, filename, lineno):
         """
@@ -2209,7 +2235,16 @@
         self.debugServer.remoteBreakpoint(
             aw.getFileName(), line, 1, None, 1)
         self.debugServer.remoteContinue()
-    
+
+    def __moveInstructionPointer(self):
+        """
+        Private method to move the instruction pointer to a different line.
+        """
+        self.lastAction = 0
+        aw = self.viewmanager.activeWindow()
+        line = aw.getCursorPosition()[0] + 1
+        self.debugServer.remoteMoveIP(line)
+
     def __enterRemote(self):
         """
         Private method to update the user interface.
--- a/Debugger/DebugViewer.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebugViewer.py	Fri Apr 07 18:33:59 2017 +0200
@@ -362,37 +362,37 @@
         """
         self.callTraceViewer.setProjectMode(enabled)
         
-    def showVariables(self, vlist, globals):
+    def showVariables(self, vlist, showGlobals):
         """
         Public method to show the variables in the respective window.
         
         @param vlist list of variables to display
-        @param globals flag indicating global/local state
+        @param showGlobals flag indicating global/local state
         """
-        if globals:
+        if showGlobals:
             self.globalsViewer.showVariables(vlist, self.framenr)
         else:
             self.localsViewer.showVariables(vlist, self.framenr)
             
-    def showVariable(self, vlist, globals):
+    def showVariable(self, vlist, showGlobals):
         """
         Public method to show the variables in the respective window.
         
         @param vlist list of variables to display
-        @param globals flag indicating global/local state
+        @param showGlobals flag indicating global/local state
         """
-        if globals:
+        if showGlobals:
             self.globalsViewer.showVariable(vlist)
         else:
             self.localsViewer.showVariable(vlist)
             
-    def showVariablesTab(self, globals):
+    def showVariablesTab(self, showGlobals):
         """
         Public method to make a variables tab visible.
         
-        @param globals flag indicating global/local state
+        @param showGlobals flag indicating global/local state
         """
-        if globals:
+        if showGlobals:
             self.__tabWidget.setCurrentWidget(self.glvWidget)
         else:
             self.__tabWidget.setCurrentWidget(self.lvWidget)
@@ -465,16 +465,16 @@
         """
         Public slot to set the global variable filter.
         """
-        filter = self.globalsFilterEdit.text()
-        self.debugServer.remoteClientSetFilter(1, filter)
+        filterStr = self.globalsFilterEdit.text()
+        self.debugServer.remoteClientSetFilter(1, filterStr)
         self.debugServer.remoteClientVariables(2, self.globalsFilter)
         
     def setLocalsFilter(self):
         """
         Public slot to set the local variable filter.
         """
-        filter = self.localsFilterEdit.text()
-        self.debugServer.remoteClientSetFilter(0, filter)
+        filterStr = self.localsFilterEdit.text()
+        self.debugServer.remoteClientSetFilter(0, filterStr)
         if self.currentStack:
             self.debugServer.remoteClientVariables(
                 0, self.localsFilter, self.framenr)
--- a/Debugger/DebuggerInterfaceNone.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebuggerInterfaceNone.py	Fri Apr 07 18:33:59 2017 +0200
@@ -210,13 +210,22 @@
         """
         return
 
-    def remoteBreakpoint(self, fn, line, set, cond=None, temp=False):
+    def remoteMoveIP(self, line):
+        """
+        Public method to move the instruction pointer to a different line.
+        
+        @param line the new line, where execution should be continued
+        """
+        return
+
+    def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False):
         """
         Public method to set or clear a breakpoint.
         
         @param fn filename the breakpoint belongs to (string)
         @param line linenumber of the breakpoint (int)
-        @param set flag indicating setting or resetting a breakpoint (boolean)
+        @param setBreakpoint flag indicating setting or resetting a
+            breakpoint (boolean)
         @param cond condition of the breakpoint (string)
         @param temp flag indicating a temporary breakpoint (boolean)
         """
@@ -243,12 +252,12 @@
         """
         return
         
-    def remoteWatchpoint(self, cond, set, temp=False):
+    def remoteWatchpoint(self, cond, setWatch, temp=False):
         """
         Public method to set or clear a watch expression.
         
         @param cond expression of the watch expression (string)
-        @param set flag indicating setting or resetting a watch expression
+        @param setWatch flag indicating setting or resetting a watch expression
             (boolean)
         @param temp flag indicating a temporary watch expression (boolean)
         """
@@ -296,33 +305,34 @@
         """
         return
         
-    def remoteClientVariables(self, scope, filter, framenr=0):
+    def remoteClientVariables(self, scope, filterList, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param framenr framenumber of the variables to retrieve (int)
         """
         return
         
-    def remoteClientVariable(self, scope, filter, var, framenr=0):
+    def remoteClientVariable(self, scope, filterList, var, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param var list encoded name of variable to retrieve (string)
         @param framenr framenumber of the variables to retrieve (int)
         """
         return
         
-    def remoteClientSetFilter(self, scope, filter):
+    def remoteClientSetFilter(self, scope, filterStr):
         """
         Public method to set a variables filter list.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter regexp string for variable names to filter out (string)
+        @param filterStr regexp string for variable names to filter out
+            (string)
         """
         return
         
--- a/Debugger/DebuggerInterfacePython2.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebuggerInterfacePython2.py	Fri Apr 07 18:33:59 2017 +0200
@@ -563,6 +563,16 @@
             "special": special,
         })
 
+    def remoteMoveIP(self, line):
+        """
+        Public method to move the instruction pointer to a different line.
+        
+        @param line the new line, where execution should be continued
+        """
+        self.__sendJsonCommand("RequestMoveIP", {
+            "newLine": line,
+        })
+
     def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False):
         """
         Public method to set or clear a breakpoint.
@@ -681,26 +691,26 @@
             "threadID": tid,
         })
         
-    def remoteClientVariables(self, scope, filter, framenr=0):
+    def remoteClientVariables(self, scope, filterList, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendJsonCommand("RequestVariables", {
             "frameNumber": framenr,
             "scope": scope,
-            "filters": filter,
+            "filters": filterList,
         })
         
-    def remoteClientVariable(self, scope, filter, var, framenr=0):
+    def remoteClientVariable(self, scope, filterList, var, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param var list encoded name of variable to retrieve (string)
         @param framenr framenumber of the variables to retrieve (int)
         """
@@ -708,19 +718,20 @@
             "variable": var,
             "frameNumber": framenr,
             "scope": scope,
-            "filters": filter,
+            "filters": filterList,
         })
         
-    def remoteClientSetFilter(self, scope, filter):
+    def remoteClientSetFilter(self, scope, filterStr):
         """
         Public method to set a variables filter list.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter regexp string for variable names to filter out (string)
+        @param filterStr regexp string for variable names to filter out
+            (string)
         """
         self.__sendJsonCommand("RequestSetFilter", {
             "scope": scope,
-            "filter": filter,
+            "filter": filterStr,
         })
         
     def setCallTraceEnabled(self, on):
--- a/Debugger/DebuggerInterfacePython3.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/DebuggerInterfacePython3.py	Fri Apr 07 18:33:59 2017 +0200
@@ -563,6 +563,16 @@
             "special": special,
         })
 
+    def remoteMoveIP(self, line):
+        """
+        Public method to move the instruction pointer to a different line.
+        
+        @param line the new line, where execution should be continued
+        """
+        self.__sendJsonCommand("RequestMoveIP", {
+            "newLine": line,
+        })
+
     def remoteBreakpoint(self, fn, line, setBreakpoint, cond=None, temp=False):
         """
         Public method to set or clear a breakpoint.
@@ -681,26 +691,26 @@
             "threadID": tid,
         })
         
-    def remoteClientVariables(self, scope, filter, framenr=0):
+    def remoteClientVariables(self, scope, filterList, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param framenr framenumber of the variables to retrieve (int)
         """
         self.__sendJsonCommand("RequestVariables", {
             "frameNumber": framenr,
             "scope": scope,
-            "filters": filter,
+            "filters": filterList,
         })
     
-    def remoteClientVariable(self, scope, filter, var, framenr=0):
+    def remoteClientVariable(self, scope, filterList, var, framenr=0):
         """
         Public method to request the variables of the debugged program.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter list of variable types to filter out (list of int)
+        @param filterList list of variable types to filter out (list of int)
         @param var list encoded name of variable to retrieve (string)
         @param framenr framenumber of the variables to retrieve (int)
         """
@@ -708,19 +718,20 @@
             "variable": var,
             "frameNumber": framenr,
             "scope": scope,
-            "filters": filter,
+            "filters": filterList,
         })
     
-    def remoteClientSetFilter(self, scope, filter):
+    def remoteClientSetFilter(self, scope, filterStr):
         """
         Public method to set a variables filter list.
         
         @param scope the scope of the variables (0 = local, 1 = global)
-        @param filter regexp string for variable names to filter out (string)
+        @param filterStr regexp string for variable names to filter out
+            (string)
         """
         self.__sendJsonCommand("RequestSetFilter", {
             "scope": scope,
-            "filter": filter,
+            "filter": filterStr,
         })
     
     def setCallTraceEnabled(self, on):
--- a/Debugger/EditBreakpointDialog.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/EditBreakpointDialog.py	Fri Apr 07 18:33:59 2017 +0200
@@ -22,12 +22,12 @@
     """
     Class implementing a dialog to edit breakpoint properties.
     """
-    def __init__(self, id, properties, condHistory, parent=None, name=None,
-                 modal=False, addMode=False, filenameHistory=None):
+    def __init__(self, breakPointId, properties, condHistory, parent=None,
+                 name=None, modal=False, addMode=False, filenameHistory=None):
         """
         Constructor
         
-        @param id id of the breakpoint (tuple)
+        @param breakPointId id of the breakpoint (tuple)
                 (filename, linenumber)
         @param properties properties for the breakpoint (tuple)
                 (condition, temporary flag, enabled flag, ignore count)
@@ -49,7 +49,7 @@
         
         self.okButton = self.buttonBox.button(QDialogButtonBox.Ok)
         
-        fn, lineno = id
+        fn, lineno = breakPointId
         
         if not addMode:
             cond, temp, enabled, count = properties
--- a/Debugger/StartDialog.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/StartDialog.py	Fri Apr 07 18:33:59 2017 +0200
@@ -26,9 +26,9 @@
     whether exception reporting should be disabled.
     """
     def __init__(self, caption, argvList, wdList, envList, exceptions,
-                 parent=None, type=0, modfuncList=None, tracePython=False,
-                 autoClearShell=True, autoContinue=True, autoFork=False,
-                 forkChild=False):
+                 parent=None, dialogType=0, modfuncList=None,
+                 tracePython=False, autoClearShell=True, autoContinue=True,
+                 autoFork=False, forkChild=False):
         """
         Constructor
         
@@ -38,7 +38,7 @@
         @param envList history list of environment settings (list of strings)
         @param exceptions exception reporting flag (boolean)
         @param parent parent widget of this dialog (QWidget)
-        @param type type of the start dialog
+        @param dialogType type of the start dialog
                 <ul>
                 <li>0 = start debug dialog</li>
                 <li>1 = start run dialog</li>
@@ -60,17 +60,17 @@
         super(StartDialog, self).__init__(parent)
         self.setModal(True)
         
-        self.type = type
-        if type == 0:
+        self.dialogType = dialogType
+        if dialogType == 0:
             from .Ui_StartDebugDialog import Ui_StartDebugDialog
             self.ui = Ui_StartDebugDialog()
-        elif type == 1:
+        elif dialogType == 1:
             from .Ui_StartRunDialog import Ui_StartRunDialog
             self.ui = Ui_StartRunDialog()
-        elif type == 2:
+        elif dialogType == 2:
             from .Ui_StartCoverageDialog import Ui_StartCoverageDialog
             self.ui = Ui_StartCoverageDialog()
-        elif type == 3:
+        elif dialogType == 3:
             from .Ui_StartProfileDialog import Ui_StartProfileDialog
             self.ui = Ui_StartProfileDialog()
         self.ui.setupUi(self)
@@ -103,18 +103,18 @@
             Preferences.getDebugger("ConsoleDbgCommand") != "")
         self.ui.consoleCheckBox.setChecked(False)
         
-        if type == 0:        # start debug dialog
+        if dialogType == 0:        # start debug dialog
             self.ui.tracePythonCheckBox.setChecked(tracePython)
             self.ui.tracePythonCheckBox.show()
             self.ui.autoContinueCheckBox.setChecked(autoContinue)
             self.ui.forkModeCheckBox.setChecked(autoFork)
             self.ui.forkChildCheckBox.setChecked(forkChild)
         
-        if type == 1:       # start run dialog
+        if dialogType == 1:       # start run dialog
             self.ui.forkModeCheckBox.setChecked(autoFork)
             self.ui.forkChildCheckBox.setChecked(forkChild)
         
-        if type == 3:       # start coverage or profile dialog
+        if dialogType == 3:       # start coverage or profile dialog
             self.ui.eraseCheckBox.setChecked(True)
         
         self.__clearHistoryLists = False
@@ -161,7 +161,7 @@
             indicating, that the debugger should debug the child process after
             forking automatically (boolean)
         """
-        if self.type == 0:
+        if self.dialogType == 0:
             return (self.ui.tracePythonCheckBox.isChecked(),
                     self.ui.autoContinueCheckBox.isChecked(),
                     self.ui.forkModeCheckBox.isChecked(),
@@ -177,7 +177,7 @@
             should debug the child process after forking automatically
             (boolean)
         """
-        if self.type == 1:
+        if self.dialogType == 1:
             return (self.ui.forkModeCheckBox.isChecked(),
                     self.ui.forkChildCheckBox.isChecked())
         
@@ -188,7 +188,7 @@
         
         @return flag indicating erasure of coverage info (boolean)
         """
-        if self.type == 2:
+        if self.dialogType == 2:
             return self.ui.eraseCheckBox.isChecked()
         
     def getProfilingData(self):
@@ -198,7 +198,7 @@
         
         @return flag indicating erasure of profiling info (boolean)
         """
-        if self.type == 3:
+        if self.dialogType == 3:
             return self.ui.eraseCheckBox.isChecked()
         
     def __clearHistories(self):
--- a/Debugger/VariablesViewer.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/VariablesViewer.py	Fri Apr 07 18:33:59 2017 +0200
@@ -238,9 +238,10 @@
             par = par.parent()
         
         # step 2: request the variable from the debugger
-        filter = e5App().getObject("DebugUI").variablesFilter(self.globalScope)
+        variablesFilter = e5App().getObject("DebugUI").variablesFilter(
+            self.globalScope)
         e5App().getObject("DebugServer").remoteClientVariable(
-            self.globalScope, filter, pathlist, self.framenr)
+            self.globalScope, variablesFilter, pathlist, self.framenr)
 
 
 class ArrayElementVarItem(VariableItem):
--- a/Debugger/WatchPointModel.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/WatchPointModel.py	Fri Apr 07 18:33:59 2017 +0200
@@ -41,16 +41,16 @@
                            Qt.Alignment(Qt.AlignRight),
                            ]
         
-    def columnCount(self, parent=QModelIndex()):
+    def columnCount(self, parent=None):
         """
         Public method to get the current column count.
         
-        @param parent index of the parent item (QModelIndex)
+        @param parent index of the parent item (QModelIndex) (Unused)
         @return column count (integer)
         """
         return len(self.header)
     
-    def rowCount(self, parent=QModelIndex()):
+    def rowCount(self, parent=None):
         """
         Public method to get the current row count.
         
@@ -58,7 +58,7 @@
         @return row count (integer)
         """
         # we do not have a tree, parent should always be invalid
-        if not parent.isValid():
+        if parent is None or not parent.isValid():
             return len(self.watchpoints)
         else:
             return 0
@@ -121,7 +121,7 @@
         
         return None
     
-    def index(self, row, column, parent=QModelIndex()):
+    def index(self, row, column, parent=None):
         """
         Public method to create an index.
         
@@ -130,7 +130,7 @@
         @param parent index of the parent item (QModelIndex)
         @return requested index (QModelIndex)
         """
-        if parent.isValid() or \
+        if (parent and parent.isValid()) or \
            row < 0 or row >= len(self.watchpoints) or \
            column < 0 or column >= len(self.header):
             return QModelIndex()
@@ -146,14 +146,14 @@
         """
         return QModelIndex()
     
-    def hasChildren(self, parent=QModelIndex()):
+    def hasChildren(self, parent=None):
         """
         Public method to check for the presence of child items.
         
         @param parent index of parent item (QModelIndex)
         @return flag indicating the presence of child items (boolean)
         """
-        if not parent.isValid():
+        if parent is None or not parent.isValid():
             return len(self.watchpoints) > 0
         else:
             return False
--- a/Debugger/WatchPointViewer.py	Thu Mar 23 18:58:56 2017 +0100
+++ b/Debugger/WatchPointViewer.py	Fri Apr 07 18:33:59 2017 +0200
@@ -221,7 +221,7 @@
             self.__setRowSelected(index, False)
     
     def __findDuplicates(self, cond, special, showMessage=False,
-                         index=QModelIndex()):
+                         index=None):
         """
         Private method to check, if an entry already exists.
         
@@ -233,6 +233,8 @@
             (QModelIndex)
         @return flag indicating a duplicate entry (boolean)
         """
+        if index is None:
+            index = QModelIndex()
         idx = self.__model.getWatchPointIndex(cond, special)
         duplicate = idx.isValid() and \
             idx.internalPointer() != index.internalPointer()
Binary file Documentation/Help/source.qch has changed
--- a/Documentation/Help/source.qhp	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Help/source.qhp	Fri Apr 07 18:33:59 2017 +0200
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <QtHelpProject version="1.0">
-  <namespace>org.eric6.ide.62</namespace>
+  <namespace>org.eric6.ide</namespace>
   <virtualFolder>eric6</virtualFolder>
   <customFilter name="eric6">
-    <filterAttribute>6.2</filterAttribute>
     <filterAttribute>eric6</filterAttribute>
     <filterAttribute>ide</filterAttribute>
   </customFilter>
   <filterSection>
-    <filterAttribute>6.2</filterAttribute>
     <filterAttribute>eric6</filterAttribute>
     <filterAttribute>ide</filterAttribute>
     <toc>
@@ -474,13 +472,14 @@
             </section>
             <section title="eric6.Plugins.CheckerPlugins" ref="index-eric6.Plugins.CheckerPlugins.html">
               <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker" ref="index-eric6.Plugins.CheckerPlugins.CodeStyleChecker.html">
+                <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCodeSelectionDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCodeSelectionDialog.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleStatisticsDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleStatisticsDialog.html" />
+                <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html" />
-                <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html" />
                 <section title="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html" />
@@ -622,6 +621,7 @@
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html" />
+                <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectBrowserHelper.html" />
                 <section title="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html" />
@@ -2767,6 +2767,13 @@
       <keyword name="CodeMetricsDialog.on_startButton_clicked" id="CodeMetricsDialog.on_startButton_clicked" ref="eric6.DataViews.CodeMetricsDialog.html#CodeMetricsDialog.on_startButton_clicked" />
       <keyword name="CodeMetricsDialog.prepare" id="CodeMetricsDialog.prepare" ref="eric6.DataViews.CodeMetricsDialog.html#CodeMetricsDialog.prepare" />
       <keyword name="CodeMetricsDialog.start" id="CodeMetricsDialog.start" ref="eric6.DataViews.CodeMetricsDialog.html#CodeMetricsDialog.start" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog" id="CodeStyleAddBuiltinIgnoreDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog (Constructor)" id="CodeStyleAddBuiltinIgnoreDialog (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog.__init__" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog (Module)" id="CodeStyleAddBuiltinIgnoreDialog (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog.__updateOkButton" id="CodeStyleAddBuiltinIgnoreDialog.__updateOkButton" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog.__updateOkButton" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog.getData" id="CodeStyleAddBuiltinIgnoreDialog.getData" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog.getData" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged" id="CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged" />
+      <keyword name="CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged" id="CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html#CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged" />
       <keyword name="CodeStyleChecker (Module)" id="CodeStyleChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html" />
       <keyword name="CodeStyleChecker (Package)" id="CodeStyleChecker (Package)" ref="index-eric6.Plugins.CheckerPlugins.CodeStyleChecker.html" />
       <keyword name="CodeStyleCheckerDialog" id="CodeStyleCheckerDialog" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog" />
@@ -2777,9 +2784,11 @@
       <keyword name="CodeStyleCheckerDialog.__createErrorItem" id="CodeStyleCheckerDialog.__createErrorItem" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__createErrorItem" />
       <keyword name="CodeStyleCheckerDialog.__createResultItem" id="CodeStyleCheckerDialog.__createResultItem" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__createResultItem" />
       <keyword name="CodeStyleCheckerDialog.__finish" id="CodeStyleCheckerDialog.__finish" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__finish" />
+      <keyword name="CodeStyleCheckerDialog.__getBuiltinsIgnoreList" id="CodeStyleCheckerDialog.__getBuiltinsIgnoreList" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__getBuiltinsIgnoreList" />
       <keyword name="CodeStyleCheckerDialog.__getEol" id="CodeStyleCheckerDialog.__getEol" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__getEol" />
       <keyword name="CodeStyleCheckerDialog.__getSelectedFixableItems" id="CodeStyleCheckerDialog.__getSelectedFixableItems" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__getSelectedFixableItems" />
       <keyword name="CodeStyleCheckerDialog.__getSelectedFutureImports" id="CodeStyleCheckerDialog.__getSelectedFutureImports" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__getSelectedFutureImports" />
+      <keyword name="CodeStyleCheckerDialog.__initBuiltinsIgnoreList" id="CodeStyleCheckerDialog.__initBuiltinsIgnoreList" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__initBuiltinsIgnoreList" />
       <keyword name="CodeStyleCheckerDialog.__initFuturesList" id="CodeStyleCheckerDialog.__initFuturesList" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__initFuturesList" />
       <keyword name="CodeStyleCheckerDialog.__itemFixable" id="CodeStyleCheckerDialog.__itemFixable" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__itemFixable" />
       <keyword name="CodeStyleCheckerDialog.__modifyFixedResultItem" id="CodeStyleCheckerDialog.__modifyFixedResultItem" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__modifyFixedResultItem" />
@@ -2793,7 +2802,10 @@
       <keyword name="CodeStyleCheckerDialog.__updateStatistics" id="CodeStyleCheckerDialog.__updateStatistics" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.__updateStatistics" />
       <keyword name="CodeStyleCheckerDialog.check" id="CodeStyleCheckerDialog.check" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.check" />
       <keyword name="CodeStyleCheckerDialog.checkBatch" id="CodeStyleCheckerDialog.checkBatch" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.checkBatch" />
+      <keyword name="CodeStyleCheckerDialog.on_addBuiltinButton_clicked" id="CodeStyleCheckerDialog.on_addBuiltinButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_addBuiltinButton_clicked" />
+      <keyword name="CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged" id="CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged" />
       <keyword name="CodeStyleCheckerDialog.on_buttonBox_clicked" id="CodeStyleCheckerDialog.on_buttonBox_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_buttonBox_clicked" />
+      <keyword name="CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked" id="CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked" />
       <keyword name="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked" id="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked" />
       <keyword name="CodeStyleCheckerDialog.on_fixButton_clicked" id="CodeStyleCheckerDialog.on_fixButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_fixButton_clicked" />
       <keyword name="CodeStyleCheckerDialog.on_fixIssuesSelectButton_clicked" id="CodeStyleCheckerDialog.on_fixIssuesSelectButton_clicked" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html#CodeStyleCheckerDialog.on_fixIssuesSelectButton_clicked" />
@@ -2983,6 +2995,15 @@
       <keyword name="CompleterRuby.__inSingleQuotedString" id="CompleterRuby.__inSingleQuotedString" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.__inSingleQuotedString" />
       <keyword name="CompleterRuby.charAdded" id="CompleterRuby.charAdded" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.charAdded" />
       <keyword name="CompleterRuby.readSettings" id="CompleterRuby.readSettings" ref="eric6.QScintilla.TypingCompleters.CompleterRuby.html#CompleterRuby.readSettings" />
+      <keyword name="ComplexityChecker" id="ComplexityChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker" />
+      <keyword name="ComplexityChecker (Constructor)" id="ComplexityChecker (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__init__" />
+      <keyword name="ComplexityChecker (Module)" id="ComplexityChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html" />
+      <keyword name="ComplexityChecker.__checkLineComplexity" id="ComplexityChecker.__checkLineComplexity" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__checkLineComplexity" />
+      <keyword name="ComplexityChecker.__checkMcCabeComplexity" id="ComplexityChecker.__checkMcCabeComplexity" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__checkMcCabeComplexity" />
+      <keyword name="ComplexityChecker.__error" id="ComplexityChecker.__error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__error" />
+      <keyword name="ComplexityChecker.__ignoreCode" id="ComplexityChecker.__ignoreCode" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__ignoreCode" />
+      <keyword name="ComplexityChecker.__reportInvalidSyntax" id="ComplexityChecker.__reportInvalidSyntax" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.__reportInvalidSyntax" />
+      <keyword name="ComplexityChecker.run" id="ComplexityChecker.run" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#ComplexityChecker.run" />
       <keyword name="Config (Module)" id="Config (Module)" ref="eric6.Debugger.Config.html" />
       <keyword name="Config (Module)" id="Config (Module)" ref="eric6.DocumentationTools.Config.html" />
       <keyword name="Config (Module)" id="Config (Module)" ref="eric6.E5XML.Config.html" />
@@ -3302,6 +3323,7 @@
       <keyword name="DebugBase.getFrameLocals" id="DebugBase.getFrameLocals" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.getFrameLocals" />
       <keyword name="DebugBase.getStack" id="DebugBase.getStack" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.getStack" />
       <keyword name="DebugBase.go" id="DebugBase.go" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.go" />
+      <keyword name="DebugBase.move_instruction_pointer" id="DebugBase.move_instruction_pointer" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.move_instruction_pointer" />
       <keyword name="DebugBase.profile" id="DebugBase.profile" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.profile" />
       <keyword name="DebugBase.profileWithRecursion" id="DebugBase.profileWithRecursion" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.profileWithRecursion" />
       <keyword name="DebugBase.run" id="DebugBase.run" ref="eric6.DebugClients.Python.DebugBase.html#DebugBase.run" />
@@ -3442,6 +3464,7 @@
       <keyword name="DebugServer.remoteCoverage" id="DebugServer.remoteCoverage" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteCoverage" />
       <keyword name="DebugServer.remoteEnvironment" id="DebugServer.remoteEnvironment" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteEnvironment" />
       <keyword name="DebugServer.remoteLoad" id="DebugServer.remoteLoad" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteLoad" />
+      <keyword name="DebugServer.remoteMoveIP" id="DebugServer.remoteMoveIP" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteMoveIP" />
       <keyword name="DebugServer.remoteProfile" id="DebugServer.remoteProfile" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteProfile" />
       <keyword name="DebugServer.remoteRawInput" id="DebugServer.remoteRawInput" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteRawInput" />
       <keyword name="DebugServer.remoteRun" id="DebugServer.remoteRun" ref="eric6.Debugger.DebugServer.html#DebugServer.remoteRun" />
@@ -3518,6 +3541,7 @@
       <keyword name="DebugUI.__getClientVariables" id="DebugUI.__getClientVariables" ref="eric6.Debugger.DebugUI.html#DebugUI.__getClientVariables" />
       <keyword name="DebugUI.__getThreadList" id="DebugUI.__getThreadList" ref="eric6.Debugger.DebugUI.html#DebugUI.__getThreadList" />
       <keyword name="DebugUI.__lastEditorClosed" id="DebugUI.__lastEditorClosed" ref="eric6.Debugger.DebugUI.html#DebugUI.__lastEditorClosed" />
+      <keyword name="DebugUI.__moveInstructionPointer" id="DebugUI.__moveInstructionPointer" ref="eric6.Debugger.DebugUI.html#DebugUI.__moveInstructionPointer" />
       <keyword name="DebugUI.__nextBreakpoint" id="DebugUI.__nextBreakpoint" ref="eric6.Debugger.DebugUI.html#DebugUI.__nextBreakpoint" />
       <keyword name="DebugUI.__passiveDebugStarted" id="DebugUI.__passiveDebugStarted" ref="eric6.Debugger.DebugUI.html#DebugUI.__passiveDebugStarted" />
       <keyword name="DebugUI.__previousBreakpoint" id="DebugUI.__previousBreakpoint" ref="eric6.Debugger.DebugUI.html#DebugUI.__previousBreakpoint" />
@@ -3614,6 +3638,7 @@
       <keyword name="DebuggerInterfaceNone.remoteEnvironment" id="DebuggerInterfaceNone.remoteEnvironment" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteEnvironment" />
       <keyword name="DebuggerInterfaceNone.remoteEval" id="DebuggerInterfaceNone.remoteEval" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteEval" />
       <keyword name="DebuggerInterfaceNone.remoteLoad" id="DebuggerInterfaceNone.remoteLoad" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteLoad" />
+      <keyword name="DebuggerInterfaceNone.remoteMoveIP" id="DebuggerInterfaceNone.remoteMoveIP" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteMoveIP" />
       <keyword name="DebuggerInterfaceNone.remoteProfile" id="DebuggerInterfaceNone.remoteProfile" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteProfile" />
       <keyword name="DebuggerInterfaceNone.remoteRawInput" id="DebuggerInterfaceNone.remoteRawInput" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteRawInput" />
       <keyword name="DebuggerInterfaceNone.remoteRun" id="DebuggerInterfaceNone.remoteRun" ref="eric6.Debugger.DebuggerInterfaceNone.html#DebuggerInterfaceNone.remoteRun" />
@@ -3661,6 +3686,7 @@
       <keyword name="DebuggerInterfacePython2.remoteCoverage" id="DebuggerInterfacePython2.remoteCoverage" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteCoverage" />
       <keyword name="DebuggerInterfacePython2.remoteEnvironment" id="DebuggerInterfacePython2.remoteEnvironment" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteEnvironment" />
       <keyword name="DebuggerInterfacePython2.remoteLoad" id="DebuggerInterfacePython2.remoteLoad" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteLoad" />
+      <keyword name="DebuggerInterfacePython2.remoteMoveIP" id="DebuggerInterfacePython2.remoteMoveIP" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteMoveIP" />
       <keyword name="DebuggerInterfacePython2.remoteProfile" id="DebuggerInterfacePython2.remoteProfile" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteProfile" />
       <keyword name="DebuggerInterfacePython2.remoteRawInput" id="DebuggerInterfacePython2.remoteRawInput" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteRawInput" />
       <keyword name="DebuggerInterfacePython2.remoteRun" id="DebuggerInterfacePython2.remoteRun" ref="eric6.Debugger.DebuggerInterfacePython2.html#DebuggerInterfacePython2.remoteRun" />
@@ -3708,6 +3734,7 @@
       <keyword name="DebuggerInterfacePython3.remoteCoverage" id="DebuggerInterfacePython3.remoteCoverage" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteCoverage" />
       <keyword name="DebuggerInterfacePython3.remoteEnvironment" id="DebuggerInterfacePython3.remoteEnvironment" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteEnvironment" />
       <keyword name="DebuggerInterfacePython3.remoteLoad" id="DebuggerInterfacePython3.remoteLoad" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteLoad" />
+      <keyword name="DebuggerInterfacePython3.remoteMoveIP" id="DebuggerInterfacePython3.remoteMoveIP" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteMoveIP" />
       <keyword name="DebuggerInterfacePython3.remoteProfile" id="DebuggerInterfacePython3.remoteProfile" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteProfile" />
       <keyword name="DebuggerInterfacePython3.remoteRawInput" id="DebuggerInterfacePython3.remoteRawInput" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteRawInput" />
       <keyword name="DebuggerInterfacePython3.remoteRun" id="DebuggerInterfacePython3.remoteRun" ref="eric6.Debugger.DebuggerInterfacePython3.html#DebuggerInterfacePython3.remoteRun" />
@@ -8110,10 +8137,14 @@
       <keyword name="HgUserConfigDialog (Constructor)" id="HgUserConfigDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__init__" />
       <keyword name="HgUserConfigDialog (Module)" id="HgUserConfigDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html" />
       <keyword name="HgUserConfigDialog.__assembleFingerprints" id="HgUserConfigDialog.__assembleFingerprints" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__assembleFingerprints" />
+      <keyword name="HgUserConfigDialog.__assembleMinimumProtocols" id="HgUserConfigDialog.__assembleMinimumProtocols" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__assembleMinimumProtocols" />
       <keyword name="HgUserConfigDialog.__clearDialog" id="HgUserConfigDialog.__clearDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearDialog" />
       <keyword name="HgUserConfigDialog.__clearFingerprints" id="HgUserConfigDialog.__clearFingerprints" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearFingerprints" />
+      <keyword name="HgUserConfigDialog.__clearMinimumProtocols" id="HgUserConfigDialog.__clearMinimumProtocols" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__clearMinimumProtocols" />
       <keyword name="HgUserConfigDialog.__finalizeFingerprintsColumns" id="HgUserConfigDialog.__finalizeFingerprintsColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__finalizeFingerprintsColumns" />
+      <keyword name="HgUserConfigDialog.__finalizeProtocolsColumns" id="HgUserConfigDialog.__finalizeProtocolsColumns" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__finalizeProtocolsColumns" />
       <keyword name="HgUserConfigDialog.__updateFingerprintsButtons" id="HgUserConfigDialog.__updateFingerprintsButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__updateFingerprintsButtons" />
+      <keyword name="HgUserConfigDialog.__updateProtocolsButtons" id="HgUserConfigDialog.__updateProtocolsButtons" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.__updateProtocolsButtons" />
       <keyword name="HgUserConfigDialog.accept" id="HgUserConfigDialog.accept" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.accept" />
       <keyword name="HgUserConfigDialog.eventFilter" id="HgUserConfigDialog.eventFilter" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.eventFilter" />
       <keyword name="HgUserConfigDialog.on_editorButton_clicked" id="HgUserConfigDialog.on_editorButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_editorButton_clicked" />
@@ -8121,6 +8152,10 @@
       <keyword name="HgUserConfigDialog.on_fpAddButton_clicked" id="HgUserConfigDialog.on_fpAddButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpAddButton_clicked" />
       <keyword name="HgUserConfigDialog.on_fpDeleteButton_clicked" id="HgUserConfigDialog.on_fpDeleteButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpDeleteButton_clicked" />
       <keyword name="HgUserConfigDialog.on_fpEditButton_clicked" id="HgUserConfigDialog.on_fpEditButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_fpEditButton_clicked" />
+      <keyword name="HgUserConfigDialog.on_protocolAddButton_clicked" id="HgUserConfigDialog.on_protocolAddButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_protocolAddButton_clicked" />
+      <keyword name="HgUserConfigDialog.on_protocolDeleteButton_clicked" id="HgUserConfigDialog.on_protocolDeleteButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_protocolDeleteButton_clicked" />
+      <keyword name="HgUserConfigDialog.on_protocolEditButton_clicked" id="HgUserConfigDialog.on_protocolEditButton_clicked" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_protocolEditButton_clicked" />
+      <keyword name="HgUserConfigDialog.on_protocolsList_currentItemChanged" id="HgUserConfigDialog.on_protocolsList_currentItemChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.on_protocolsList_currentItemChanged" />
       <keyword name="HgUserConfigDialog.readUserConfig" id="HgUserConfigDialog.readUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.readUserConfig" />
       <keyword name="HgUserConfigDialog.writeUserConfig" id="HgUserConfigDialog.writeUserConfig" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html#HgUserConfigDialog.writeUserConfig" />
       <keyword name="HgUserConfigHostFingerprintDialog" id="HgUserConfigHostFingerprintDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog" />
@@ -8131,6 +8166,13 @@
       <keyword name="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" id="HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_fingerprintEdit_textChanged" />
       <keyword name="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" id="HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_hashComboBox_currentIndexChanged" />
       <keyword name="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" id="HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html#HgUserConfigHostFingerprintDialog.on_hostEdit_textChanged" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog" id="HgUserConfigHostMinimumProtocolDialog" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog (Constructor)" id="HgUserConfigHostMinimumProtocolDialog (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog.__init__" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog (Module)" id="HgUserConfigHostMinimumProtocolDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog.__updateOkButton" id="HgUserConfigHostMinimumProtocolDialog.__updateOkButton" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog.__updateOkButton" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog.getData" id="HgUserConfigHostMinimumProtocolDialog.getData" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog.getData" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged" id="HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged" />
+      <keyword name="HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged" id="HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html#HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged" />
       <keyword name="HgUtilities (Module)" id="HgUtilities (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html" />
       <keyword name="HighlightingStylesReader" id="HighlightingStylesReader" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader" />
       <keyword name="HighlightingStylesReader (Constructor)" id="HighlightingStylesReader (Constructor)" ref="eric6.E5XML.HighlightingStylesReader.html#HighlightingStylesReader.__init__" />
@@ -9445,6 +9487,11 @@
       <keyword name="LfRevisionsInputDialog (Module)" id="LfRevisionsInputDialog (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html" />
       <keyword name="LfRevisionsInputDialog.getRevisions" id="LfRevisionsInputDialog.getRevisions" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html#LfRevisionsInputDialog.getRevisions" />
       <keyword name="LfRevisionsInputDialog.on_revisionsEdit_textChanged" id="LfRevisionsInputDialog.on_revisionsEdit_textChanged" ref="eric6.Plugins.VcsPlugins.vcsMercurial.LargefilesExtension.LfRevisionsInputDialog.html#LfRevisionsInputDialog.on_revisionsEdit_textChanged" />
+      <keyword name="LineComplexityVisitor" id="LineComplexityVisitor" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor" />
+      <keyword name="LineComplexityVisitor (Constructor)" id="LineComplexityVisitor (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.__init__" />
+      <keyword name="LineComplexityVisitor.score" id="LineComplexityVisitor.score" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.score" />
+      <keyword name="LineComplexityVisitor.sortedList" id="LineComplexityVisitor.sortedList" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.sortedList" />
+      <keyword name="LineComplexityVisitor.visit" id="LineComplexityVisitor.visit" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html#LineComplexityVisitor.visit" />
       <keyword name="LineShortener" id="LineShortener" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#LineShortener" />
       <keyword name="LineShortener (Constructor)" id="LineShortener (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#LineShortener.__init__" />
       <keyword name="LineShortener.__breakMultiline" id="LineShortener.__breakMultiline" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html#LineShortener.__breakMultiline" />
@@ -9604,13 +9651,6 @@
       <keyword name="MasterPasswordEntryDialog.on_currentPasswordEdit_textChanged" id="MasterPasswordEntryDialog.on_currentPasswordEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog.on_currentPasswordEdit_textChanged" />
       <keyword name="MasterPasswordEntryDialog.on_newPasswordAgainEdit_textChanged" id="MasterPasswordEntryDialog.on_newPasswordAgainEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog.on_newPasswordAgainEdit_textChanged" />
       <keyword name="MasterPasswordEntryDialog.on_newPasswordEdit_textChanged" id="MasterPasswordEntryDialog.on_newPasswordEdit_textChanged" ref="eric6.Preferences.ConfigurationPages.MasterPasswordEntryDialog.html#MasterPasswordEntryDialog.on_newPasswordEdit_textChanged" />
-      <keyword name="McCabeChecker" id="McCabeChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker" />
-      <keyword name="McCabeChecker (Constructor)" id="McCabeChecker (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker.__init__" />
-      <keyword name="McCabeChecker (Module)" id="McCabeChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html" />
-      <keyword name="McCabeChecker.__error" id="McCabeChecker.__error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker.__error" />
-      <keyword name="McCabeChecker.__ignoreCode" id="McCabeChecker.__ignoreCode" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker.__ignoreCode" />
-      <keyword name="McCabeChecker.__reportInvalidSyntax" id="McCabeChecker.__reportInvalidSyntax" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker.__reportInvalidSyntax" />
-      <keyword name="McCabeChecker.run" id="McCabeChecker.run" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html#McCabeChecker.run" />
       <keyword name="MercurialPage" id="MercurialPage" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage" />
       <keyword name="MercurialPage (Constructor)" id="MercurialPage (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html#MercurialPage.__init__" />
       <keyword name="MercurialPage (Module)" id="MercurialPage (Module)" ref="eric6.Plugins.VcsPlugins.vcsMercurial.ConfigurationPage.MercurialPage.html" />
@@ -9722,11 +9762,13 @@
       <keyword name="MiscellaneousChecker" id="MiscellaneousChecker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker" />
       <keyword name="MiscellaneousChecker (Constructor)" id="MiscellaneousChecker (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__init__" />
       <keyword name="MiscellaneousChecker (Module)" id="MiscellaneousChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html" />
-      <keyword name="MiscellaneousChecker.__checkBlindExcept" id="MiscellaneousChecker.__checkBlindExcept" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkBlindExcept" />
+      <keyword name="MiscellaneousChecker.__checkBuiltins" id="MiscellaneousChecker.__checkBuiltins" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkBuiltins" />
       <keyword name="MiscellaneousChecker.__checkCoding" id="MiscellaneousChecker.__checkCoding" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkCoding" />
+      <keyword name="MiscellaneousChecker.__checkComprehensions" id="MiscellaneousChecker.__checkComprehensions" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkComprehensions" />
       <keyword name="MiscellaneousChecker.__checkCopyright" id="MiscellaneousChecker.__checkCopyright" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkCopyright" />
       <keyword name="MiscellaneousChecker.__checkFormatString" id="MiscellaneousChecker.__checkFormatString" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkFormatString" />
       <keyword name="MiscellaneousChecker.__checkFuture" id="MiscellaneousChecker.__checkFuture" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkFuture" />
+      <keyword name="MiscellaneousChecker.__checkMutableDefault" id="MiscellaneousChecker.__checkMutableDefault" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkMutableDefault" />
       <keyword name="MiscellaneousChecker.__checkPep3101" id="MiscellaneousChecker.__checkPep3101" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkPep3101" />
       <keyword name="MiscellaneousChecker.__checkPrintStatements" id="MiscellaneousChecker.__checkPrintStatements" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkPrintStatements" />
       <keyword name="MiscellaneousChecker.__checkTuple" id="MiscellaneousChecker.__checkTuple" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html#MiscellaneousChecker.__checkTuple" />
@@ -9903,7 +9945,7 @@
       <keyword name="NamingStyleChecker (Module)" id="NamingStyleChecker (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html" />
       <keyword name="NamingStyleChecker.__checkClassName" id="NamingStyleChecker.__checkClassName" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkClassName" />
       <keyword name="NamingStyleChecker.__checkFunctionArgumentNames" id="NamingStyleChecker.__checkFunctionArgumentNames" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkFunctionArgumentNames" />
-      <keyword name="NamingStyleChecker.__checkFuntionName" id="NamingStyleChecker.__checkFuntionName" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkFuntionName" />
+      <keyword name="NamingStyleChecker.__checkFunctionName" id="NamingStyleChecker.__checkFunctionName" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkFunctionName" />
       <keyword name="NamingStyleChecker.__checkImportAs" id="NamingStyleChecker.__checkImportAs" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkImportAs" />
       <keyword name="NamingStyleChecker.__checkModule" id="NamingStyleChecker.__checkModule" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkModule" />
       <keyword name="NamingStyleChecker.__checkNameToBeAvoided" id="NamingStyleChecker.__checkNameToBeAvoided" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html#NamingStyleChecker.__checkNameToBeAvoided" />
@@ -10537,6 +10579,7 @@
       <keyword name="PathGraphingAstVisitor._subgraph" id="PathGraphingAstVisitor._subgraph" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor._subgraph" />
       <keyword name="PathGraphingAstVisitor._subgraph_parse" id="PathGraphingAstVisitor._subgraph_parse" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor._subgraph_parse" />
       <keyword name="PathGraphingAstVisitor.appendPathNode" id="PathGraphingAstVisitor.appendPathNode" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor.appendPathNode" />
+      <keyword name="PathGraphingAstVisitor.default" id="PathGraphingAstVisitor.default" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor.default" />
       <keyword name="PathGraphingAstVisitor.dispatch_list" id="PathGraphingAstVisitor.dispatch_list" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor.dispatch_list" />
       <keyword name="PathGraphingAstVisitor.reset" id="PathGraphingAstVisitor.reset" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor.reset" />
       <keyword name="PathGraphingAstVisitor.visitClassDef" id="PathGraphingAstVisitor.visitClassDef" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html#PathGraphingAstVisitor.visitClassDef" />
@@ -15735,6 +15778,7 @@
       <keyword name="WebBrowserView.__searchImage" id="WebBrowserView.__searchImage" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__searchImage" />
       <keyword name="WebBrowserView.__searchRequested" id="WebBrowserView.__searchRequested" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__searchRequested" />
       <keyword name="WebBrowserView.__sendLink" id="WebBrowserView.__sendLink" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__sendLink" />
+      <keyword name="WebBrowserView.__setRwhvqt" id="WebBrowserView.__setRwhvqt" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__setRwhvqt" />
       <keyword name="WebBrowserView.__showTabCrashPage" id="WebBrowserView.__showTabCrashPage" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__showTabCrashPage" />
       <keyword name="WebBrowserView.__urlChanged" id="WebBrowserView.__urlChanged" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__urlChanged" />
       <keyword name="WebBrowserView.__virusTotal" id="WebBrowserView.__virusTotal" ref="eric6.WebBrowser.WebBrowserView.html#WebBrowserView.__virusTotal" />
@@ -17399,13 +17443,14 @@
       <file>eric6.PluginManager.PluginRepositoryDialog.html</file>
       <file>eric6.PluginManager.PluginUninstallDialog.html</file>
       <file>eric6.Plugins.AboutPlugin.AboutDialog.html</file>
+      <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCodeSelectionDialog.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleStatisticsDialog.html</file>
+      <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.DocStyleChecker.html</file>
-      <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html</file>
       <file>eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html</file>
@@ -17493,6 +17538,7 @@
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgTagDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostFingerprintDialog.html</file>
+      <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HgUtilities.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditCommitEditor.html</file>
       <file>eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditConfigDialog.html</file>
--- a/Documentation/Source/eric6.Cooperation.ChatWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Cooperation.ChatWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -52,7 +52,7 @@
 <dd>
 emitted to signal a change of the connected
             state (bool)
-</dd><dt>editorCommand(hash, filename, message)</dt>
+</dd><dt>editorCommand(hashStr, filename, message)</dt>
 <dd>
 emitted when an editor
             command has been received (string, string, string)
@@ -255,11 +255,11 @@
         Private slot to cut the contents of the chat display to the clipboard.
 </p><a NAME="ChatWidget.__editorCommandMessage" ID="ChatWidget.__editorCommandMessage"></a>
 <h4>ChatWidget.__editorCommandMessage</h4>
-<b>__editorCommandMessage</b>(<i>hash, fileName, message</i>)
+<b>__editorCommandMessage</b>(<i>hashStr, fileName, message</i>)
 <p>
         Private slot to handle editor command messages from the client.
 </p><dl>
-<dt><i>hash</i></dt>
+<dt><i>hashStr</i></dt>
 <dd>
 hash of the project (string)
 </dd><dt><i>fileName</i></dt>
--- a/Documentation/Source/eric6.DataViews.CodeMetrics.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DataViews.CodeMetrics.html	Fri Apr 07 18:33:59 2017 +0200
@@ -183,11 +183,11 @@
 </dd>
 </dl><a NAME="SourceStat.getCounter" ID="SourceStat.getCounter"></a>
 <h4>SourceStat.getCounter</h4>
-<b>getCounter</b>(<i>id, key</i>)
+<b>getCounter</b>(<i>counterId, key</i>)
 <p>
         Public method used to get a specific counter value.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>counterId</i></dt>
 <dd>
 id of the counter (string)
 </dd><dt><i>key</i></dt>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugBase.html	Fri Apr 07 18:33:59 2017 +0200
@@ -56,7 +56,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>_fnCache</td></tr><tr><td>filesToSkip</td></tr><tr><td>lib</td></tr><tr><td>pathsToSkip</td></tr>
+<tr><td>_fnCache</td></tr><tr><td>filesToSkip</td></tr><tr><td>lib</td></tr><tr><td>pathsToSkip</td></tr><tr><td>pollTimerEnabled</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -119,6 +119,9 @@
 <td><a href="#DebugBase.go">go</a></td>
 <td>Public method to resume the thread.</td>
 </tr><tr>
+<td><a href="#DebugBase.move_instruction_pointer">move_instruction_pointer</a></td>
+<td>Public methode to move the instruction pointer to another line.</td>
+</tr><tr>
 <td><a href="#DebugBase.profile">profile</a></td>
 <td>Public method used to trace some stuff independent of the debugger trace function.</td>
 </tr><tr>
@@ -476,6 +479,16 @@
 <dd>
 flag indicating a special continue operation
 </dd>
+</dl><a NAME="DebugBase.move_instruction_pointer" ID="DebugBase.move_instruction_pointer"></a>
+<h4>DebugBase.move_instruction_pointer</h4>
+<b>move_instruction_pointer</b>(<i>lineno</i>)
+<p>
+        Public methode to move the instruction pointer to another line.
+</p><dl>
+<dt><i>lineno</i> (int)</dt>
+<dd>
+new line number
+</dd>
 </dl><a NAME="DebugBase.profile" ID="DebugBase.profile"></a>
 <h4>DebugBase.profile</h4>
 <b>profile</b>(<i>frame, event, arg</i>)
@@ -517,17 +530,17 @@
 </dd>
 </dl><a NAME="DebugBase.run" ID="DebugBase.run"></a>
 <h4>DebugBase.run</h4>
-<b>run</b>(<i>cmd, globals=None, locals=None, debug=True</i>)
+<b>run</b>(<i>cmd, globalsDict=None, localsDict=None, debug=True</i>)
 <p>
         Public method to start a given command under debugger control.
 </p><dl>
 <dt><i>cmd</i> (str or CodeType)</dt>
 <dd>
 command / code to execute under debugger control
-</dd><dt><i>globals=</i> (dict)</dt>
+</dd><dt><i>globalsDict=</i> (dict)</dt>
 <dd>
 dictionary of global variables for cmd
-</dd><dt><i>locals=</i> (dict)</dt>
+</dd><dt><i>localsDict=</i> (dict)</dt>
 <dd>
 dictionary of local variables for cmd
 </dd><dt><i>debug=</i> (bool)</dt>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugClientBase.html	Fri Apr 07 18:33:59 2017 +0200
@@ -274,7 +274,7 @@
 </dd>
 </dl><a NAME="DebugClientBase.__dumpVariable" ID="DebugClientBase.__dumpVariable"></a>
 <h4>DebugClientBase.__dumpVariable</h4>
-<b>__dumpVariable</b>(<i>var, frmnr, scope, filter</i>)
+<b>__dumpVariable</b>(<i>var, frmnr, scope, filterList</i>)
 <p>
         Private method to return the variables of a frame to the debug server.
 </p><dl>
@@ -289,14 +289,14 @@
 </dd><dt><i>scope</i></dt>
 <dd>
 1 to report global variables, 0 for local variables (int)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 the indices of variable types to be filtered
             (list of int)
 </dd>
 </dl><a NAME="DebugClientBase.__dumpVariables" ID="DebugClientBase.__dumpVariables"></a>
 <h4>DebugClientBase.__dumpVariables</h4>
-<b>__dumpVariables</b>(<i>frmnr, scope, filter</i>)
+<b>__dumpVariables</b>(<i>frmnr, scope, filterList</i>)
 <p>
         Private method to return the variables of a frame to the debug server.
 </p><dl>
@@ -307,7 +307,7 @@
 </dd><dt><i>scope</i></dt>
 <dd>
 1 to report global variables, 0 for local variables (int)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 the indices of variable types to be filtered
             (list of int)
@@ -355,7 +355,7 @@
 </dd>
 </dl><a NAME="DebugClientBase.__formatVariablesList" ID="DebugClientBase.__formatVariablesList"></a>
 <h4>DebugClientBase.__formatVariablesList</h4>
-<b>__formatVariablesList</b>(<i>keylist, dict_, scope, filter=[], formatSequences=False</i>)
+<b>__formatVariablesList</b>(<i>keylist, dict_, scope, filterList=None, formatSequences=False</i>)
 <p>
         Private method to produce a formated variables list.
 </p><p>
@@ -377,11 +377,11 @@
             filter (int).
             Variables are only added to the list, if their name do not match
             any of the filter expressions.
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
-the indices of variable types to be filtered. Variables
-            are only added to the list, if their type is not contained in the
-            filter list.
+the indices of variable types to be filtered.
+            Variables are only added to the list, if their type is not
+            contained in the filter list.
 </dd><dt><i>formatSequences</i></dt>
 <dd>
 flag indicating, that sequence or dictionary
@@ -825,12 +825,12 @@
 </dd>
 </dl><a NAME="DebugClientBase.sessionClose" ID="DebugClientBase.sessionClose"></a>
 <h4>DebugClientBase.sessionClose</h4>
-<b>sessionClose</b>(<i>exit=True</i>)
+<b>sessionClose</b>(<i>terminate=True</i>)
 <p>
         Public method to close the session with the debugger and optionally
         terminate.
 </p><dl>
-<dt><i>exit</i></dt>
+<dt><i>terminate</i></dt>
 <dd>
 flag indicating to terminate (boolean)
 </dd>
--- a/Documentation/Source/eric6.DebugClients.Python.DebugUtilities.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.DebugUtilities.html	Fri Apr 07 18:33:59 2017 +0200
@@ -76,7 +76,7 @@
 <hr /><hr />
 <a NAME="formatargvalues" ID="formatargvalues"></a>
 <h2>formatargvalues</h2>
-<b>formatargvalues</b>(<i>args, varargs, varkw, locals, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value)</i>)
+<b>formatargvalues</b>(<i>args, varargs, varkw, localsDict, formatarg=str, formatvarargs=lambda name: '*' + name, formatvarkw=lambda name: '**' + name, formatvalue=lambda value: '=' + repr(value)</i>)
 <p>
     Function to format an argument spec from the 4 values returned
     by getargvalues.
@@ -90,7 +90,7 @@
 </dd><dt><i>varkw</i> (str)</dt>
 <dd>
 name of the keyword arguments
-</dd><dt><i>locals</i> (dict)</dt>
+</dd><dt><i>localsDict</i> (dict)</dt>
 <dd>
 reference to the local variables dictionary
 </dd><dt><i>formatarg=</i> (func)</dt>
--- a/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DebugClients.Python.ThreadExtension.html	Fri Apr 07 18:33:59 2017 +0200
@@ -169,7 +169,7 @@
 </dd>
 </dl><a NAME="ThreadExtension.attachThread" ID="ThreadExtension.attachThread"></a>
 <h4>ThreadExtension.attachThread</h4>
-<b>attachThread</b>(<i>target=None, args=None, kwargs={}, mainThread=False</i>)
+<b>attachThread</b>(<i>target=None, args=None, kwargs=None, mainThread=False</i>)
 <p>
         Public method to setup a standard thread for DebugClient to debug.
 </p><p>
@@ -286,11 +286,11 @@
 </dd>
 </dl><a NAME="ThreadExtension.setCurrentThread" ID="ThreadExtension.setCurrentThread"></a>
 <h4>ThreadExtension.setCurrentThread</h4>
-<b>setCurrentThread</b>(<i>id</i>)
+<b>setCurrentThread</b>(<i>threadId</i>)
 <p>
         Public method to set the current thread.
 </p><dl>
-<dt><i>id</i> (int)</dt>
+<dt><i>threadId</i> (int)</dt>
 <dd>
 the id the current thread should be set to.
 </dd>
--- a/Documentation/Source/eric6.Debugger.BreakPointModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.BreakPointModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -149,13 +149,13 @@
 </dd>
 </dl><a NAME="BreakPointModel.columnCount" ID="BreakPointModel.columnCount"></a>
 <h4>BreakPointModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the current column count.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-reference to parent index (QModelIndex)
+reference to parent index (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -257,7 +257,7 @@
 </dd>
 </dl><a NAME="BreakPointModel.hasChildren" ID="BreakPointModel.hasChildren"></a>
 <h4>BreakPointModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check for the presence of child items.
 </p><dl>
@@ -293,7 +293,7 @@
 </dd>
 </dl><a NAME="BreakPointModel.index" ID="BreakPointModel.index"></a>
 <h4>BreakPointModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -344,7 +344,7 @@
 </dd>
 </dl><a NAME="BreakPointModel.rowCount" ID="BreakPointModel.rowCount"></a>
 <h4>BreakPointModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the current row count.
 </p><dl>
--- a/Documentation/Source/eric6.Debugger.DebugServer.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugServer.html	Fri Apr 07 18:33:59 2017 +0200
@@ -388,6 +388,9 @@
 <td><a href="#DebugServer.remoteLoad">remoteLoad</a></td>
 <td>Public method to load a new program to debug.</td>
 </tr><tr>
+<td><a href="#DebugServer.remoteMoveIP">remoteMoveIP</a></td>
+<td>Public method to move the instruction pointer to a different line.</td>
+</tr><tr>
 <td><a href="#DebugServer.remoteProfile">remoteProfile</a></td>
 <td>Public method to load a new program to collect profiling data.</td>
 </tr><tr>
@@ -763,14 +766,14 @@
 </dd>
 </dl><a NAME="DebugServer.__remoteWatchpoint" ID="DebugServer.__remoteWatchpoint"></a>
 <h4>DebugServer.__remoteWatchpoint</h4>
-<b>__remoteWatchpoint</b>(<i>cond, set, temp=False</i>)
+<b>__remoteWatchpoint</b>(<i>cond, setWatch, temp=False</i>)
 <p>
         Private method to set or clear a watch expression.
 </p><dl>
 <dt><i>cond</i></dt>
 <dd>
 expression of the watch expression (string)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setWatch</i></dt>
 <dd>
 flag indicating setting or resetting a watch expression
             (boolean)
@@ -897,7 +900,7 @@
         Public method to process the client stop test info.
 </p><a NAME="DebugServer.clientUtTestErrored" ID="DebugServer.clientUtTestErrored"></a>
 <h4>DebugServer.clientUtTestErrored</h4>
-<b>clientUtTestErrored</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestErrored</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test errored info.
 </p><dl>
@@ -907,13 +910,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestFailed" ID="DebugServer.clientUtTestFailed"></a>
 <h4>DebugServer.clientUtTestFailed</h4>
-<b>clientUtTestFailed</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestFailed</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test failed info.
 </p><dl>
@@ -923,13 +926,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestFailedExpected" ID="DebugServer.clientUtTestFailedExpected"></a>
 <h4>DebugServer.clientUtTestFailedExpected</h4>
-<b>clientUtTestFailedExpected</b>(<i>testname, traceback, id</i>)
+<b>clientUtTestFailedExpected</b>(<i>testname, traceback, testId</i>)
 <p>
         Public method to process the client test failed expected info.
 </p><dl>
@@ -939,13 +942,13 @@
 </dd><dt><i>traceback</i></dt>
 <dd>
 lines of traceback info (list of strings)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestSkipped" ID="DebugServer.clientUtTestSkipped"></a>
 <h4>DebugServer.clientUtTestSkipped</h4>
-<b>clientUtTestSkipped</b>(<i>testname, reason, id</i>)
+<b>clientUtTestSkipped</b>(<i>testname, reason, testId</i>)
 <p>
         Public method to process the client test skipped info.
 </p><dl>
@@ -955,20 +958,20 @@
 </dd><dt><i>reason</i></dt>
 <dd>
 reason for skipping the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="DebugServer.clientUtTestSucceededUnexpected" ID="DebugServer.clientUtTestSucceededUnexpected"></a>
 <h4>DebugServer.clientUtTestSucceededUnexpected</h4>
-<b>clientUtTestSucceededUnexpected</b>(<i>testname, id</i>)
+<b>clientUtTestSucceededUnexpected</b>(<i>testname, testId</i>)
 <p>
         Public method to process the client test succeeded unexpected info.
 </p><dl>
 <dt><i>testname</i></dt>
 <dd>
 name of the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -984,11 +987,11 @@
 </dd>
 </dl><a NAME="DebugServer.getClientCapabilities" ID="DebugServer.getClientCapabilities"></a>
 <h4>DebugServer.getClientCapabilities</h4>
-<b>getClientCapabilities</b>(<i>type</i>)
+<b>getClientCapabilities</b>(<i>clientType</i>)
 <p>
         Public method to retrieve the debug clients capabilities.
 </p><dl>
-<dt><i>type</i></dt>
+<dt><i>clientType</i></dt>
 <dd>
 debug client type (string)
 </dd>
@@ -1119,7 +1122,7 @@
         Public slot to get the banner info of the remote client.
 </p><a NAME="DebugServer.remoteBreakpoint" ID="DebugServer.remoteBreakpoint"></a>
 <h4>DebugServer.remoteBreakpoint</h4>
-<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>)
+<b>remoteBreakpoint</b>(<i>fn, line, setBreakpoint, cond=None, temp=False</i>)
 <p>
         Public method to set or clear a breakpoint.
 </p><dl>
@@ -1129,9 +1132,10 @@
 </dd><dt><i>line</i></dt>
 <dd>
 linenumber of the breakpoint (int)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setBreakpoint</i></dt>
 <dd>
-flag indicating setting or resetting a breakpoint (boolean)
+flag indicating setting or resetting a breakpoint
+            (boolean)
 </dd><dt><i>cond</i></dt>
 <dd>
 condition of the breakpoint (string)
@@ -1146,27 +1150,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebugServer.remoteClientSetFilter" ID="DebugServer.remoteClientSetFilter"></a>
 <h4>DebugServer.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebugServer.remoteClientVariable" ID="DebugServer.remoteClientVariable"></a>
 <h4>DebugServer.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -1178,14 +1183,14 @@
 </dd>
 </dl><a NAME="DebugServer.remoteClientVariables" ID="DebugServer.remoteClientVariables"></a>
 <h4>DebugServer.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
@@ -1312,6 +1317,16 @@
 flag indicating to enable the call trace
             function (boolean)
 </dd>
+</dl><a NAME="DebugServer.remoteMoveIP" ID="DebugServer.remoteMoveIP"></a>
+<h4>DebugServer.remoteMoveIP</h4>
+<b>remoteMoveIP</b>(<i>line</i>)
+<p>
+        Public method to move the instruction pointer to a different line.
+</p><dl>
+<dt><i>line</i></dt>
+<dd>
+the new line, where execution should be continued
+</dd>
 </dl><a NAME="DebugServer.remoteProfile" ID="DebugServer.remoteProfile"></a>
 <h4>DebugServer.remoteProfile</h4>
 <b>remoteProfile</b>(<i>fn, argv, wd, env, autoClearShell=True, erase=False, forProject=False, runInConsole=False, clientType=""</i>)
--- a/Documentation/Source/eric6.Debugger.DebugUI.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugUI.html	Fri Apr 07 18:33:59 2017 +0200
@@ -193,6 +193,9 @@
 <td><a href="#DebugUI.__lastEditorClosed">__lastEditorClosed</a></td>
 <td>Private slot to handle the closeProgram signal.</td>
 </tr><tr>
+<td><a href="#DebugUI.__moveInstructionPointer">__moveInstructionPointer</a></td>
+<td>Private method to move the instruction pointer to a different line.</td>
+</tr><tr>
 <td><a href="#DebugUI.__nextBreakpoint">__nextBreakpoint</a></td>
 <td>Private slot to handle the 'Next breakpoint' action.</td>
 </tr><tr>
@@ -661,6 +664,11 @@
 <b>__lastEditorClosed</b>(<i></i>)
 <p>
         Private slot to handle the closeProgram signal.
+</p><a NAME="DebugUI.__moveInstructionPointer" ID="DebugUI.__moveInstructionPointer"></a>
+<h4>DebugUI.__moveInstructionPointer</h4>
+<b>__moveInstructionPointer</b>(<i></i>)
+<p>
+        Private method to move the instruction pointer to a different line.
 </p><a NAME="DebugUI.__nextBreakpoint" ID="DebugUI.__nextBreakpoint"></a>
 <h4>DebugUI.__nextBreakpoint</h4>
 <b>__nextBreakpoint</b>(<i></i>)
--- a/Documentation/Source/eric6.Debugger.DebugViewer.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebugViewer.html	Fri Apr 07 18:33:59 2017 +0200
@@ -385,37 +385,37 @@
 </dd>
 </dl><a NAME="DebugViewer.showVariable" ID="DebugViewer.showVariable"></a>
 <h4>DebugViewer.showVariable</h4>
-<b>showVariable</b>(<i>vlist, globals</i>)
+<b>showVariable</b>(<i>vlist, showGlobals</i>)
 <p>
         Public method to show the variables in the respective window.
 </p><dl>
 <dt><i>vlist</i></dt>
 <dd>
 list of variables to display
-</dd><dt><i>globals</i></dt>
+</dd><dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
 </dl><a NAME="DebugViewer.showVariables" ID="DebugViewer.showVariables"></a>
 <h4>DebugViewer.showVariables</h4>
-<b>showVariables</b>(<i>vlist, globals</i>)
+<b>showVariables</b>(<i>vlist, showGlobals</i>)
 <p>
         Public method to show the variables in the respective window.
 </p><dl>
 <dt><i>vlist</i></dt>
 <dd>
 list of variables to display
-</dd><dt><i>globals</i></dt>
+</dd><dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
 </dl><a NAME="DebugViewer.showVariablesTab" ID="DebugViewer.showVariablesTab"></a>
 <h4>DebugViewer.showVariablesTab</h4>
-<b>showVariablesTab</b>(<i>globals</i>)
+<b>showVariablesTab</b>(<i>showGlobals</i>)
 <p>
         Public method to make a variables tab visible.
 </p><dl>
-<dt><i>globals</i></dt>
+<dt><i>showGlobals</i></dt>
 <dd>
 flag indicating global/local state
 </dd>
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfaceNone.html	Fri Apr 07 18:33:59 2017 +0200
@@ -117,6 +117,9 @@
 <td><a href="#DebuggerInterfaceNone.remoteLoad">remoteLoad</a></td>
 <td>Public method to load a new program to debug.</td>
 </tr><tr>
+<td><a href="#DebuggerInterfaceNone.remoteMoveIP">remoteMoveIP</a></td>
+<td>Public method to move the instruction pointer to a different line.</td>
+</tr><tr>
 <td><a href="#DebuggerInterfaceNone.remoteProfile">remoteProfile</a></td>
 <td>Public method to load a new program to collect profiling data.</td>
 </tr><tr>
@@ -237,7 +240,7 @@
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteBreakpoint" ID="DebuggerInterfaceNone.remoteBreakpoint"></a>
 <h4>DebuggerInterfaceNone.remoteBreakpoint</h4>
-<b>remoteBreakpoint</b>(<i>fn, line, set, cond=None, temp=False</i>)
+<b>remoteBreakpoint</b>(<i>fn, line, setBreakpoint, cond=None, temp=False</i>)
 <p>
         Public method to set or clear a breakpoint.
 </p><dl>
@@ -247,9 +250,10 @@
 </dd><dt><i>line</i></dt>
 <dd>
 linenumber of the breakpoint (int)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setBreakpoint</i></dt>
 <dd>
-flag indicating setting or resetting a breakpoint (boolean)
+flag indicating setting or resetting a
+            breakpoint (boolean)
 </dd><dt><i>cond</i></dt>
 <dd>
 condition of the breakpoint (string)
@@ -297,27 +301,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfaceNone.remoteClientSetFilter" ID="DebuggerInterfaceNone.remoteClientSetFilter"></a>
 <h4>DebuggerInterfaceNone.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteClientVariable" ID="DebuggerInterfaceNone.remoteClientVariable"></a>
 <h4>DebuggerInterfaceNone.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -329,14 +334,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteClientVariables" ID="DebuggerInterfaceNone.remoteClientVariables"></a>
 <h4>DebuggerInterfaceNone.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
@@ -436,6 +441,16 @@
 flag indicating to debug the child after forking
             (boolean)
 </dd>
+</dl><a NAME="DebuggerInterfaceNone.remoteMoveIP" ID="DebuggerInterfaceNone.remoteMoveIP"></a>
+<h4>DebuggerInterfaceNone.remoteMoveIP</h4>
+<b>remoteMoveIP</b>(<i>line</i>)
+<p>
+        Public method to move the instruction pointer to a different line.
+</p><dl>
+<dt><i>line</i></dt>
+<dd>
+the new line, where execution should be continued
+</dd>
 </dl><a NAME="DebuggerInterfaceNone.remoteProfile" ID="DebuggerInterfaceNone.remoteProfile"></a>
 <h4>DebuggerInterfaceNone.remoteProfile</h4>
 <b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>)
@@ -579,14 +594,14 @@
         public method to stop a unittest run.
 </p><a NAME="DebuggerInterfaceNone.remoteWatchpoint" ID="DebuggerInterfaceNone.remoteWatchpoint"></a>
 <h4>DebuggerInterfaceNone.remoteWatchpoint</h4>
-<b>remoteWatchpoint</b>(<i>cond, set, temp=False</i>)
+<b>remoteWatchpoint</b>(<i>cond, setWatch, temp=False</i>)
 <p>
         Public method to set or clear a watch expression.
 </p><dl>
 <dt><i>cond</i></dt>
 <dd>
 expression of the watch expression (string)
-</dd><dt><i>set</i></dt>
+</dd><dt><i>setWatch</i></dt>
 <dd>
 flag indicating setting or resetting a watch expression
             (boolean)
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfacePython2.html	Fri Apr 07 18:33:59 2017 +0200
@@ -138,6 +138,9 @@
 <td><a href="#DebuggerInterfacePython2.remoteLoad">remoteLoad</a></td>
 <td>Public method to load a new program to debug.</td>
 </tr><tr>
+<td><a href="#DebuggerInterfacePython2.remoteMoveIP">remoteMoveIP</a></td>
+<td>Public method to move the instruction pointer to a different line.</td>
+</tr><tr>
 <td><a href="#DebuggerInterfacePython2.remoteProfile">remoteProfile</a></td>
 <td>Public method to load a new program to collect profiling data.</td>
 </tr><tr>
@@ -419,27 +422,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfacePython2.remoteClientSetFilter" ID="DebuggerInterfacePython2.remoteClientSetFilter"></a>
 <h4>DebuggerInterfacePython2.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfacePython2.remoteClientVariable" ID="DebuggerInterfacePython2.remoteClientVariable"></a>
 <h4>DebuggerInterfacePython2.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -451,14 +455,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfacePython2.remoteClientVariables" ID="DebuggerInterfacePython2.remoteClientVariables"></a>
 <h4>DebuggerInterfacePython2.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
@@ -547,6 +551,16 @@
 flag indicating to debug the child after forking
             (boolean)
 </dd>
+</dl><a NAME="DebuggerInterfacePython2.remoteMoveIP" ID="DebuggerInterfacePython2.remoteMoveIP"></a>
+<h4>DebuggerInterfacePython2.remoteMoveIP</h4>
+<b>remoteMoveIP</b>(<i>line</i>)
+<p>
+        Public method to move the instruction pointer to a different line.
+</p><dl>
+<dt><i>line</i></dt>
+<dd>
+the new line, where execution should be continued
+</dd>
 </dl><a NAME="DebuggerInterfacePython2.remoteProfile" ID="DebuggerInterfacePython2.remoteProfile"></a>
 <h4>DebuggerInterfacePython2.remoteProfile</h4>
 <b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>)
--- a/Documentation/Source/eric6.Debugger.DebuggerInterfacePython3.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.DebuggerInterfacePython3.html	Fri Apr 07 18:33:59 2017 +0200
@@ -138,6 +138,9 @@
 <td><a href="#DebuggerInterfacePython3.remoteLoad">remoteLoad</a></td>
 <td>Public method to load a new program to debug.</td>
 </tr><tr>
+<td><a href="#DebuggerInterfacePython3.remoteMoveIP">remoteMoveIP</a></td>
+<td>Public method to move the instruction pointer to a different line.</td>
+</tr><tr>
 <td><a href="#DebuggerInterfacePython3.remoteProfile">remoteProfile</a></td>
 <td>Public method to load a new program to collect profiling data.</td>
 </tr><tr>
@@ -419,27 +422,28 @@
         Public slot to get the debug clients capabilities.
 </p><a NAME="DebuggerInterfacePython3.remoteClientSetFilter" ID="DebuggerInterfacePython3.remoteClientSetFilter"></a>
 <h4>DebuggerInterfacePython3.remoteClientSetFilter</h4>
-<b>remoteClientSetFilter</b>(<i>scope, filter</i>)
+<b>remoteClientSetFilter</b>(<i>scope, filterStr</i>)
 <p>
         Public method to set a variables filter list.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
-regexp string for variable names to filter out (string)
+regexp string for variable names to filter out
+            (string)
 </dd>
 </dl><a NAME="DebuggerInterfacePython3.remoteClientVariable" ID="DebuggerInterfacePython3.remoteClientVariable"></a>
 <h4>DebuggerInterfacePython3.remoteClientVariable</h4>
-<b>remoteClientVariable</b>(<i>scope, filter, var, framenr=0</i>)
+<b>remoteClientVariable</b>(<i>scope, filterList, var, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>var</i></dt>
@@ -451,14 +455,14 @@
 </dd>
 </dl><a NAME="DebuggerInterfacePython3.remoteClientVariables" ID="DebuggerInterfacePython3.remoteClientVariables"></a>
 <h4>DebuggerInterfacePython3.remoteClientVariables</h4>
-<b>remoteClientVariables</b>(<i>scope, filter, framenr=0</i>)
+<b>remoteClientVariables</b>(<i>scope, filterList, framenr=0</i>)
 <p>
         Public method to request the variables of the debugged program.
 </p><dl>
 <dt><i>scope</i></dt>
 <dd>
 the scope of the variables (0 = local, 1 = global)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of variable types to filter out (list of int)
 </dd><dt><i>framenr</i></dt>
@@ -547,6 +551,16 @@
 flag indicating to debug the child after forking
             (boolean)
 </dd>
+</dl><a NAME="DebuggerInterfacePython3.remoteMoveIP" ID="DebuggerInterfacePython3.remoteMoveIP"></a>
+<h4>DebuggerInterfacePython3.remoteMoveIP</h4>
+<b>remoteMoveIP</b>(<i>line</i>)
+<p>
+        Public method to move the instruction pointer to a different line.
+</p><dl>
+<dt><i>line</i></dt>
+<dd>
+the new line, where execution should be continued
+</dd>
 </dl><a NAME="DebuggerInterfacePython3.remoteProfile" ID="DebuggerInterfacePython3.remoteProfile"></a>
 <h4>DebuggerInterfacePython3.remoteProfile</h4>
 <b>remoteProfile</b>(<i>fn, argv, wd, erase=False</i>)
--- a/Documentation/Source/eric6.Debugger.EditBreakpointDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.EditBreakpointDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -76,11 +76,11 @@
 </table>
 <a NAME="EditBreakpointDialog.__init__" ID="EditBreakpointDialog.__init__"></a>
 <h4>EditBreakpointDialog (Constructor)</h4>
-<b>EditBreakpointDialog</b>(<i>id, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None</i>)
+<b>EditBreakpointDialog</b>(<i>breakPointId, properties, condHistory, parent=None, name=None, modal=False, addMode=False, filenameHistory=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>breakPointId</i></dt>
 <dd>
 id of the breakpoint (tuple)
                 (filename, linenumber)
--- a/Documentation/Source/eric6.Debugger.StartDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.StartDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -108,7 +108,7 @@
 </table>
 <a NAME="StartDialog.__init__" ID="StartDialog.__init__"></a>
 <h4>StartDialog (Constructor)</h4>
-<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent=None, type=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False</i>)
+<b>StartDialog</b>(<i>caption, argvList, wdList, envList, exceptions, parent=None, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False</i>)
 <p>
         Constructor
 </p><dl>
@@ -130,7 +130,7 @@
 </dd><dt><i>parent</i></dt>
 <dd>
 parent widget of this dialog (QWidget)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>dialogType</i></dt>
 <dd>
 type of the start dialog
                 <ul>
--- a/Documentation/Source/eric6.Debugger.WatchPointModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.WatchPointModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -143,13 +143,13 @@
 </dd>
 </dl><a NAME="WatchPointModel.columnCount" ID="WatchPointModel.columnCount"></a>
 <h4>WatchPointModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the current column count.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-index of the parent item (QModelIndex)
+index of the parent item (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -253,7 +253,7 @@
 </dd>
 </dl><a NAME="WatchPointModel.hasChildren" ID="WatchPointModel.hasChildren"></a>
 <h4>WatchPointModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check for the presence of child items.
 </p><dl>
@@ -289,7 +289,7 @@
 </dd>
 </dl><a NAME="WatchPointModel.index" ID="WatchPointModel.index"></a>
 <h4>WatchPointModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -325,7 +325,7 @@
 </dd>
 </dl><a NAME="WatchPointModel.rowCount" ID="WatchPointModel.rowCount"></a>
 <h4>WatchPointModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the current row count.
 </p><dl>
--- a/Documentation/Source/eric6.Debugger.WatchPointViewer.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Debugger.WatchPointViewer.html	Fri Apr 07 18:33:59 2017 +0200
@@ -260,7 +260,7 @@
         Private slot to handle the enable watch expression context menu entry.
 </p><a NAME="WatchPointViewer.__findDuplicates" ID="WatchPointViewer.__findDuplicates"></a>
 <h4>WatchPointViewer.__findDuplicates</h4>
-<b>__findDuplicates</b>(<i>cond, special, showMessage=False, index=QModelIndex()</i>)
+<b>__findDuplicates</b>(<i>cond, special, showMessage=False, index=None</i>)
 <p>
         Private method to check, if an entry already exists.
 </p><dl>
--- a/Documentation/Source/eric6.DocumentationTools.ModuleDocumentor.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.DocumentationTools.ModuleDocumentor.html	Fri Apr 07 18:33:59 2017 +0200
@@ -308,16 +308,17 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genListSection" ID="ModuleDocument.__genListSection"></a>
 <h4>ModuleDocument.__genListSection</h4>
-<b>__genListSection</b>(<i>names, dict, kwSuffix=""</i>)
+<b>__genListSection</b>(<i>names, sectionDict, kwSuffix=""</i>)
 <p>
         Private method to generate a list section of the document.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 The names to appear in the list. (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
-A dictionary containing all relevant information.
+dictionary containing all relevant information
+            (dict)
 </dd><dt><i>kwSuffix</i></dt>
 <dd>
 suffix to be used for the QtHelp keywords (string)
@@ -325,11 +326,11 @@
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-The list section. (string)
+list section (string)
 </dd>
 </dl><a NAME="ModuleDocument.__genMethodSection" ID="ModuleDocument.__genMethodSection"></a>
 <h4>ModuleDocument.__genMethodSection</h4>
-<b>__genMethodSection</b>(<i>obj, className, filter</i>)
+<b>__genMethodSection</b>(<i>obj, className, modifierFilter</i>)
 <p>
         Private method to generate the method details section.
 </p><dl>
@@ -339,7 +340,7 @@
 </dd><dt><i>className</i></dt>
 <dd>
 name of the class containing the method (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>modifierFilter</i></dt>
 <dd>
 filter value designating the method types
 </dd>
@@ -350,16 +351,17 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genMethodsListSection" ID="ModuleDocument.__genMethodsListSection"></a>
 <h4>ModuleDocument.__genMethodsListSection</h4>
-<b>__genMethodsListSection</b>(<i>names, dict, className, clsName, includeInit=True</i>)
+<b>__genMethodsListSection</b>(<i>names, sectionDict, className, clsName, includeInit=True</i>)
 <p>
         Private method to generate the methods list section of a class.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 names to appear in the list (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
 dictionary containing all relevant information
+            (dict)
 </dd><dt><i>className</i></dt>
 <dd>
 class name containing the names
@@ -423,19 +425,20 @@
 </dd>
 </dl><a NAME="ModuleDocument.__genRbModulesClassesListSection" ID="ModuleDocument.__genRbModulesClassesListSection"></a>
 <h4>ModuleDocument.__genRbModulesClassesListSection</h4>
-<b>__genRbModulesClassesListSection</b>(<i>names, dict, moduleName</i>)
+<b>__genRbModulesClassesListSection</b>(<i>names, sectionDict, moduleName</i>)
 <p>
         Private method to generate the classes list section of a Ruby module.
 </p><dl>
 <dt><i>names</i></dt>
 <dd>
 The names to appear in the list. (list of strings)
-</dd><dt><i>dict</i></dt>
+</dd><dt><i>sectionDict</i></dt>
 <dd>
-A dictionary containing all relevant information.
+dictionary containing all relevant information
+            (dict)
 </dd><dt><i>moduleName</i></dt>
 <dd>
-Name of the Ruby module containing the classes.
+name of the Ruby module containing the classes
             (string)
 </dd>
 </dl><dl>
--- a/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Graphics.E5ArrowItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -82,7 +82,7 @@
 </table>
 <a NAME="E5ArrowItem.__init__" ID="E5ArrowItem.__init__"></a>
 <h4>E5ArrowItem (Constructor)</h4>
-<b>E5ArrowItem</b>(<i>origin=QPointF(), end=QPointF(), filled=False, type=NormalArrow, parent=None</i>)
+<b>E5ArrowItem</b>(<i>origin=None, end=None, filled=False, arrowType=NormalArrow, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -95,7 +95,7 @@
 </dd><dt><i>filled</i></dt>
 <dd>
 flag indicating a filled arrow head (boolean)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>arrowType</i></dt>
 <dd>
 arrow type (NormalArrow, WideArrow)
 </dd><dt><i>parent=</i></dt>
--- a/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Graphics.E5GraphicsView.html	Fri Apr 07 18:33:59 2017 +0200
@@ -131,7 +131,7 @@
 </dd>
 </dl><a NAME="E5GraphicsView.__getDiagram" ID="E5GraphicsView.__getDiagram"></a>
 <h4>E5GraphicsView.__getDiagram</h4>
-<b>__getDiagram</b>(<i>rect, format="PNG", filename=None</i>)
+<b>__getDiagram</b>(<i>rect, imageFormat="PNG", filename=None</i>)
 <p>
         Private method to retrieve the diagram from the scene fitting it
         in the minimum rectangle.
@@ -139,7 +139,7 @@
 <dt><i>rect</i></dt>
 <dd>
 minimum rectangle fitting the diagram (QRectF)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>imageFormat</i></dt>
 <dd>
 format for the image file (string)
 </dd><dt><i>filename</i></dt>
@@ -253,14 +253,14 @@
 </dd>
 </dl><a NAME="E5GraphicsView.saveImage" ID="E5GraphicsView.saveImage"></a>
 <h4>E5GraphicsView.saveImage</h4>
-<b>saveImage</b>(<i>filename, format="PNG"</i>)
+<b>saveImage</b>(<i>filename, imageFormat="PNG"</i>)
 <p>
         Public method to save the scene to a file.
 </p><dl>
 <dt><i>filename</i></dt>
 <dd>
 name of the file to write the image to (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>imageFormat</i></dt>
 <dd>
 format for the image file (string)
 </dd>
--- a/Documentation/Source/eric6.E5Gui.E5Application.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5Application.html	Fri Apr 07 18:33:59 2017 +0200
@@ -169,14 +169,14 @@
 </dd>
 </dl><a NAME="E5Application.registerObject" ID="E5Application.registerObject"></a>
 <h4>E5Application.registerObject</h4>
-<b>registerObject</b>(<i>name, object</i>)
+<b>registerObject</b>(<i>name, objectRef</i>)
 <p>
         Public method to register an object in the object registry.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 name of the object (string)
-</dd><dt><i>object</i></dt>
+</dd><dt><i>objectRef</i></dt>
 <dd>
 reference to the object
 </dd>
@@ -187,14 +187,14 @@
 </dd>
 </dl><a NAME="E5Application.registerPluginObject" ID="E5Application.registerPluginObject"></a>
 <h4>E5Application.registerPluginObject</h4>
-<b>registerPluginObject</b>(<i>name, object, pluginType=None</i>)
+<b>registerPluginObject</b>(<i>name, objectRef, pluginType=None</i>)
 <p>
         Public method to register a plugin object in the object registry.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 name of the plugin object (string)
-</dd><dt><i>object</i></dt>
+</dd><dt><i>objectRef</i></dt>
 <dd>
 reference to the plugin object
 </dd><dt><i>pluginType=</i></dt>
--- a/Documentation/Source/eric6.E5Gui.E5Completers.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5Completers.html	Fri Apr 07 18:33:59 2017 +0200
@@ -229,7 +229,7 @@
 </table>
 <a NAME="E5StringListCompleter.__init__" ID="E5StringListCompleter.__init__"></a>
 <h4>E5StringListCompleter (Constructor)</h4>
-<b>E5StringListCompleter</b>(<i>parent=None, strings=[], completionMode=QCompleter.PopupCompletion</i>)
+<b>E5StringListCompleter</b>(<i>parent=None, strings=None, completionMode=QCompleter.PopupCompletion</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.E5Gui.E5FileDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5FileDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -63,12 +63,12 @@
 <hr /><hr />
 <a NAME="__reorderFilter" ID="__reorderFilter"></a>
 <h2>__reorderFilter</h2>
-<b>__reorderFilter</b>(<i>filter, initialFilter=""</i>)
+<b>__reorderFilter</b>(<i>filterStr, initialFilter=""</i>)
 <p>
     Private function to reorder the file filter to cope with a KDE issue
     introduced by distributor's usage of KDE file dialogs.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 Qt file filter (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -112,7 +112,7 @@
 <hr /><hr />
 <a NAME="getOpenFileName" ID="getOpenFileName"></a>
 <h2>getOpenFileName</h2>
-<b>getOpenFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileName</b>(<i>parent=None, caption="", directory="", filterStr="", options=None</i>)
 <p>
     Module function to get the name of a file for opening it.
 </p><dl>
@@ -125,7 +125,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -142,7 +142,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNameAndFilter" ID="getOpenFileNameAndFilter"></a>
 <h2>getOpenFileNameAndFilter</h2>
-<b>getOpenFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=None</i>)
 <p>
     Module function to get the name of a file for opening it and the selected
     file name filter.
@@ -156,7 +156,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -176,7 +176,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNames" ID="getOpenFileNames"></a>
 <h2>getOpenFileNames</h2>
-<b>getOpenFileNames</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNames</b>(<i>parent=None, caption="", directory="", filterStr="", options=None</i>)
 <p>
     Module function to get a list of names of files for opening.
 </p><dl>
@@ -189,7 +189,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -206,7 +206,7 @@
 <hr /><hr />
 <a NAME="getOpenFileNamesAndFilter" ID="getOpenFileNamesAndFilter"></a>
 <h2>getOpenFileNamesAndFilter</h2>
-<b>getOpenFileNamesAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getOpenFileNamesAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=None</i>)
 <p>
     Module function to get a list of names of files for opening and the
     selected file name filter.
@@ -220,7 +220,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
@@ -241,7 +241,7 @@
 <hr /><hr />
 <a NAME="getSaveFileName" ID="getSaveFileName"></a>
 <h2>getSaveFileName</h2>
-<b>getSaveFileName</b>(<i>parent=None, caption="", directory="", filter="", options=QFileDialog.Options()</i>)
+<b>getSaveFileName</b>(<i>parent=None, caption="", directory="", filterStr="", options=None</i>)
 <p>
     Module function to get the name of a file for saving it.
 </p><dl>
@@ -254,7 +254,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>options</i></dt>
@@ -271,7 +271,7 @@
 <hr /><hr />
 <a NAME="getSaveFileNameAndFilter" ID="getSaveFileNameAndFilter"></a>
 <h2>getSaveFileNameAndFilter</h2>
-<b>getSaveFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filter="", initialFilter="", options=QFileDialog.Options()</i>)
+<b>getSaveFileNameAndFilter</b>(<i>parent=None, caption="", directory="", filterStr="", initialFilter="", options=None</i>)
 <p>
     Module function to get the name of a file for saving it and the selected
     file name filter.
@@ -285,7 +285,7 @@
 </dd><dt><i>directory</i></dt>
 <dd>
 working directory of the dialog (string)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterStr</i></dt>
 <dd>
 filter string for the dialog (string)
 </dd><dt><i>initialFilter</i></dt>
--- a/Documentation/Source/eric6.E5Gui.E5MessageBox.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5MessageBox.html	Fri Apr 07 18:33:59 2017 +0200
@@ -91,7 +91,7 @@
 </table>
 <a NAME="E5MessageBox.__init__" ID="E5MessageBox.__init__"></a>
 <h4>E5MessageBox (Constructor)</h4>
-<b>E5MessageBox</b>(<i>icon, title, text, modal=False, buttons=QMessageBox.StandardButtons(QMessageBox.NoButton), parent=None</i>)
+<b>E5MessageBox</b>(<i>icon, title, text, modal=False, buttons=QMessageBox.NoButton, parent=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.E5Gui.E5ProgressDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5ProgressDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -74,7 +74,7 @@
 </table>
 <a NAME="E5ProgressDialog.__init__" ID="E5ProgressDialog.__init__"></a>
 <h4>E5ProgressDialog (Constructor)</h4>
-<b>E5ProgressDialog</b>(<i>labelText, cancelButtonText, minimum, maximum, format=None, parent=None, flags=Qt.WindowFlags()</i>)
+<b>E5ProgressDialog</b>(<i>labelText, cancelButtonText, minimum, maximum, labelFormat=None, parent=None, flags=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -90,7 +90,7 @@
 </dd><dt><i>maximum</i></dt>
 <dd>
 maximum value (integer)
-</dd><dt><i>format=</i></dt>
+</dd><dt><i>labelFormat=</i></dt>
 <dd>
 label format of the progress bar (string)
 </dd><dt><i>parent=</i></dt>
@@ -112,11 +112,11 @@
 </dd>
 </dl><a NAME="E5ProgressDialog.setFormat" ID="E5ProgressDialog.setFormat"></a>
 <h4>E5ProgressDialog.setFormat</h4>
-<b>setFormat</b>(<i>format</i>)
+<b>setFormat</b>(<i>labelFormat</i>)
 <p>
         Public method to set the progress bar format.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>labelFormat</i></dt>
 <dd>
 progress bar format (string)
 </dd>
--- a/Documentation/Source/eric6.E5Gui.E5TreeSortFilterProxyModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5TreeSortFilterProxyModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -104,7 +104,7 @@
 </dd>
 </dl><a NAME="E5TreeSortFilterProxyModel.hasChildren" ID="E5TreeSortFilterProxyModel.hasChildren"></a>
 <h4>E5TreeSortFilterProxyModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check, if a parent node has some children.
 </p><dl>
--- a/Documentation/Source/eric6.E5Gui.E5TreeWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.E5Gui.E5TreeWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -229,11 +229,11 @@
 </dd>
 </dl><a NAME="E5TreeWidget.filterString" ID="E5TreeWidget.filterString"></a>
 <h4>E5TreeWidget.filterString</h4>
-<b>filterString</b>(<i>filter</i>)
+<b>filterString</b>(<i>filterStr</i>)
 <p>
         Public slot to set a new filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 filter to be set (string)
 </dd>
--- a/Documentation/Source/eric6.Globals.AppInfo.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Globals.AppInfo.html	Fri Apr 07 18:33:59 2017 +0200
@@ -41,7 +41,7 @@
 <hr /><hr />
 <a NAME="makeAppInfo" ID="makeAppInfo"></a>
 <h2>makeAppInfo</h2>
-<b>makeAppInfo</b>(<i>argv, name, arg, description, options=[]</i>)
+<b>makeAppInfo</b>(<i>argv, name, arg, description, options=None</i>)
 <p>
     Module function to generate a dictionary describing the application.
 </p><dl>
--- a/Documentation/Source/eric6.Globals.compatibility_fixes.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Globals.compatibility_fixes.html	Fri Apr 07 18:33:59 2017 +0200
@@ -343,11 +343,11 @@
 <hr /><hr />
 <a NAME="open" ID="open"></a>
 <h2>open</h2>
-<b>open</b>(<i>file, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True</i>)
+<b>open</b>(<i>filein, mode='r', buffering=-1, encoding=None, errors=None, newline=None, closefd=True</i>)
 <p>
     Replacement for the build in open function.
 </p><dl>
-<dt><i>file</i></dt>
+<dt><i>filein</i></dt>
 <dd>
 filename or file descriptor (string)
 </dd><dt><i>mode=</i></dt>
--- a/Documentation/Source/eric6.Graphics.AssociationItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.AssociationItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -123,7 +123,7 @@
 </dd>
 </dl><a NAME="AssociationItem.__init__" ID="AssociationItem.__init__"></a>
 <h4>AssociationItem (Constructor)</h4>
-<b>AssociationItem</b>(<i>itemA, itemB, type=Normal, topToBottom=False, parent=None</i>)
+<b>AssociationItem</b>(<i>itemA, itemB, assocType=Normal, topToBottom=False, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -133,7 +133,7 @@
 </dd><dt><i>itemB</i></dt>
 <dd>
 second widget of the association
-</dd><dt><i>type</i></dt>
+</dd><dt><i>assocType</i></dt>
 <dd>
 type of the association. This must be one of
             <ul>
--- a/Documentation/Source/eric6.Graphics.ClassItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.ClassItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -243,7 +243,7 @@
 </table>
 <a NAME="ClassModel.__init__" ID="ClassModel.__init__"></a>
 <h4>ClassModel (Constructor)</h4>
-<b>ClassModel</b>(<i>name, methods=[], attributes=[]</i>)
+<b>ClassModel</b>(<i>name, methods=None, attributes=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Graphics.ModuleItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.ModuleItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -216,7 +216,7 @@
 </table>
 <a NAME="ModuleModel.__init__" ID="ModuleModel.__init__"></a>
 <h4>ModuleModel (Constructor)</h4>
-<b>ModuleModel</b>(<i>name, classlist=[]</i>)
+<b>ModuleModel</b>(<i>name, classlist=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Graphics.PackageItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.PackageItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -220,7 +220,7 @@
 </table>
 <a NAME="PackageModel.__init__" ID="PackageModel.__init__"></a>
 <h4>PackageModel (Constructor)</h4>
-<b>PackageModel</b>(<i>name, moduleslist=[]</i>)
+<b>PackageModel</b>(<i>name, moduleslist=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Graphics.UMLGraphicsView.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.UMLGraphicsView.html	Fri Apr 07 18:33:59 2017 +0200
@@ -323,11 +323,11 @@
 </dd>
 </dl><a NAME="UMLGraphicsView.findItem" ID="UMLGraphicsView.findItem"></a>
 <h4>UMLGraphicsView.findItem</h4>
-<b>findItem</b>(<i>id</i>)
+<b>findItem</b>(<i>itemId</i>)
 <p>
         Public method to find an UML item based on the ID.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>itemId</i></dt>
 <dd>
 of the item to search for (integer)
 </dd>
--- a/Documentation/Source/eric6.Graphics.UMLItem.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Graphics.UMLItem.html	Fri Apr 07 18:33:59 2017 +0200
@@ -276,11 +276,11 @@
         Public method to remove all associations of this widget.
 </p><a NAME="UMLItem.setId" ID="UMLItem.setId"></a>
 <h4>UMLItem.setId</h4>
-<b>setId</b>(<i>id</i>)
+<b>setId</b>(<i>itemId</i>)
 <p>
         Public method to assign an ID to the item.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>itemId</i></dt>
 <dd>
 assigned ID (integer)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -203,11 +203,11 @@
         Private slot to update the selected subscription.
 </p><a NAME="AdBlockDialog.addCustomRule" ID="AdBlockDialog.addCustomRule"></a>
 <h4>AdBlockDialog.addCustomRule</h4>
-<b>addCustomRule</b>(<i>filter</i>)
+<b>addCustomRule</b>(<i>filterRule</i>)
 <p>
         Public slot to add a custom AdBlock rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
@@ -237,11 +237,11 @@
 </dd>
 </dl><a NAME="AdBlockDialog.on_searchEdit_textChanged" ID="AdBlockDialog.on_searchEdit_textChanged"></a>
 <h4>AdBlockDialog.on_searchEdit_textChanged</h4>
-<b>on_searchEdit_textChanged</b>(<i>filter</i>)
+<b>on_searchEdit_textChanged</b>(<i>filterRule</i>)
 <p>
         Private slot to set a new filter on the current widget.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be set (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockRule.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockRule.html	Fri Apr 07 18:33:59 2017 +0200
@@ -148,11 +148,11 @@
 </table>
 <a NAME="AdBlockRule.__init__" ID="AdBlockRule.__init__"></a>
 <h4>AdBlockRule (Constructor)</h4>
-<b>AdBlockRule</b>(<i>filter="", subscription=None</i>)
+<b>AdBlockRule</b>(<i>filterRule="", subscription=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter string of the rule (string)
 </dd><dt><i>subscription</i></dt>
@@ -431,11 +431,11 @@
 </dd>
 </dl><a NAME="AdBlockRule.setFilter" ID="AdBlockRule.setFilter"></a>
 <h4>AdBlockRule.setFilter</h4>
-<b>setFilter</b>(<i>filter</i>)
+<b>setFilter</b>(<i>filterRule</i>)
 <p>
         Public method to set the rule filter string.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 rule filter string (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockTreeWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.AdBlock.AdBlockTreeWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -156,11 +156,11 @@
         Private slot handling a subscription change.
 </p><a NAME="AdBlockTreeWidget.addRule" ID="AdBlockTreeWidget.addRule"></a>
 <h4>AdBlockTreeWidget.addRule</h4>
-<b>addRule</b>(<i>filter=""</i>)
+<b>addRule</b>(<i>filterRule=""</i>)
 <p>
         Public slot to add a new rule.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterRule</i></dt>
 <dd>
 filter to be added (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.AddBookmarkDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.AddBookmarkDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -337,7 +337,7 @@
 </dd>
 </dl><a NAME="AddBookmarkProxyModel.hasChildren" ID="AddBookmarkProxyModel.hasChildren"></a>
 <h4>AddBookmarkProxyModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check, if a parent node has some children.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.BookmarksImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -82,11 +82,11 @@
 </table>
 <a NAME="BookmarksImporter.__init__" ID="BookmarksImporter.__init__"></a>
 <h4>BookmarksImporter (Constructor)</h4>
-<b>BookmarksImporter</b>(<i>id="", parent=None</i>)
+<b>BookmarksImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -88,11 +88,11 @@
 </table>
 <a NAME="ChromeImporter.__init__" ID="ChromeImporter.__init__"></a>
 <h4>ChromeImporter (Constructor)</h4>
-<b>ChromeImporter</b>(<i>id="", parent=None</i>)
+<b>ChromeImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -173,11 +173,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.FirefoxImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -79,11 +79,11 @@
 </table>
 <a NAME="FirefoxImporter.__init__" ID="FirefoxImporter.__init__"></a>
 <h4>FirefoxImporter (Constructor)</h4>
-<b>FirefoxImporter</b>(<i>id="", parent=None</i>)
+<b>FirefoxImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.HtmlImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -79,11 +79,11 @@
 </table>
 <a NAME="HtmlImporter.__init__" ID="HtmlImporter.__init__"></a>
 <h4>HtmlImporter (Constructor)</h4>
-<b>HtmlImporter</b>(<i>id="", parent=None</i>)
+<b>HtmlImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given HTML source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.IExplorerImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -79,11 +79,11 @@
 </table>
 <a NAME="IExplorerImporter.__init__" ID="IExplorerImporter.__init__"></a>
 <h4>IExplorerImporter (Constructor)</h4>
-<b>IExplorerImporter</b>(<i>id="", parent=None</i>)
+<b>IExplorerImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.OperaImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -79,11 +79,11 @@
 </table>
 <a NAME="OperaImporter.__init__" ID="OperaImporter.__init__"></a>
 <h4>OperaImporter (Constructor)</h4>
-<b>OperaImporter</b>(<i>id="", parent=None</i>)
+<b>OperaImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.SafariImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -82,11 +82,11 @@
 </table>
 <a NAME="SafariImporter.__init__" ID="SafariImporter.__init__"></a>
 <h4>SafariImporter (Constructor)</h4>
-<b>SafariImporter</b>(<i>id="", parent=None</i>)
+<b>SafariImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -141,11 +141,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.XbelImporter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -79,11 +79,11 @@
 </table>
 <a NAME="XbelImporter.__init__" ID="XbelImporter.__init__"></a>
 <h4>XbelImporter (Constructor)</h4>
-<b>XbelImporter</b>(<i>id="", parent=None</i>)
+<b>XbelImporter</b>(<i>sourceId="", parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source ID (string)
 </dd><dt><i>parent</i></dt>
@@ -125,11 +125,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given XBEL source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 id of the browser ("chrome" or "chromium")
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.__init__.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksImporters.__init__.html	Fri Apr 07 18:33:59 2017 +0200
@@ -47,11 +47,11 @@
 <hr /><hr />
 <a NAME="getImporter" ID="getImporter"></a>
 <h2>getImporter</h2>
-<b>getImporter</b>(<i>id, parent=None</i>)
+<b>getImporter</b>(<i>sourceId, parent=None</i>)
 <p>
     Module function to get an importer for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get an importer for (string)
 </dd><dt><i>parent</i></dt>
@@ -73,11 +73,11 @@
 <hr /><hr />
 <a NAME="getImporterInfo" ID="getImporterInfo"></a>
 <h2>getImporterInfo</h2>
-<b>getImporterInfo</b>(<i>id</i>)
+<b>getImporterInfo</b>(<i>sourceId</i>)
 <p>
     Module function to get information for the given source id.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>sourceId</i></dt>
 <dd>
 source id to get info for (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Bookmarks.BookmarksModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -151,7 +151,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.columnCount" ID="BookmarksModel.columnCount"></a>
 <h4>BookmarksModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -262,7 +262,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.hasChildren" ID="BookmarksModel.hasChildren"></a>
 <h4>BookmarksModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check, if a parent node has some children.
 </p><dl>
@@ -298,7 +298,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.index" ID="BookmarksModel.index"></a>
 <h4>BookmarksModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to get a model index for a node cell.
 </p><dl>
@@ -374,7 +374,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.parent" ID="BookmarksModel.parent"></a>
 <h4>BookmarksModel.parent</h4>
-<b>parent</b>(<i>index=QModelIndex()</i>)
+<b>parent</b>(<i>index=None</i>)
 <p>
         Public method to get the index of the parent node.
 </p><dl>
@@ -389,7 +389,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.removeRows" ID="BookmarksModel.removeRows"></a>
 <h4>BookmarksModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove bookmarks from the model.
 </p><dl>
@@ -410,7 +410,7 @@
 </dd>
 </dl><a NAME="BookmarksModel.rowCount" ID="BookmarksModel.rowCount"></a>
 <h4>BookmarksModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.ClosedTabsManager.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.ClosedTabsManager.html	Fri Apr 07 18:33:59 2017 +0200
@@ -73,7 +73,7 @@
 </table>
 <a NAME="ClosedTab.__init__" ID="ClosedTab.__init__"></a>
 <h4>ClosedTab (Constructor)</h4>
-<b>ClosedTab</b>(<i>url=QUrl(), title="", position=-1</i>)
+<b>ClosedTab</b>(<i>url=None, title="", position=-1</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.CookieJar.CookieExceptionsModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.CookieJar.CookieExceptionsModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -136,7 +136,7 @@
 </dd>
 </dl><a NAME="CookieExceptionsModel.columnCount" ID="CookieExceptionsModel.columnCount"></a>
 <h4>CookieExceptionsModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
@@ -190,7 +190,7 @@
 </dd>
 </dl><a NAME="CookieExceptionsModel.removeRows" ID="CookieExceptionsModel.removeRows"></a>
 <h4>CookieExceptionsModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -211,7 +211,7 @@
 </dd>
 </dl><a NAME="CookieExceptionsModel.rowCount" ID="CookieExceptionsModel.rowCount"></a>
 <h4>CookieExceptionsModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.CookieJar.CookieModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.CookieJar.CookieModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -103,7 +103,7 @@
         Private slot handling changes of the cookies list in the cookie jar.
 </p><a NAME="CookieModel.columnCount" ID="CookieModel.columnCount"></a>
 <h4>CookieModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
@@ -157,7 +157,7 @@
 </dd>
 </dl><a NAME="CookieModel.removeRows" ID="CookieModel.removeRows"></a>
 <h4>CookieModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -178,7 +178,7 @@
 </dd>
 </dl><a NAME="CookieModel.rowCount" ID="CookieModel.rowCount"></a>
 <h4>CookieModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.Download.DownloadModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Download.DownloadModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -143,7 +143,7 @@
 </dd>
 </dl><a NAME="DownloadModel.removeRows" ID="DownloadModel.removeRows"></a>
 <h4>DownloadModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove bookmarks from the model.
 </p><dl>
@@ -164,7 +164,7 @@
 </dd>
 </dl><a NAME="DownloadModel.rowCount" ID="DownloadModel.rowCount"></a>
 <h4>DownloadModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.FlashCookieManager.FlashCookieManagerDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -215,11 +215,11 @@
 </dd>
 </dl><a NAME="FlashCookieManagerDialog.on_filterEdit_textChanged" ID="FlashCookieManagerDialog.on_filterEdit_textChanged"></a>
 <h4>FlashCookieManagerDialog.on_filterEdit_textChanged</h4>
-<b>on_filterEdit_textChanged</b>(<i>filter</i>)
+<b>on_filterEdit_textChanged</b>(<i>filterStr</i>)
 <p>
         Private slot to filter the cookies list.
 </p><dl>
-<dt><i>filter</i> (str)</dt>
+<dt><i>filterStr</i> (str)</dt>
 <dd>
 filter text
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.HelpIndexWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.HelpIndexWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -133,11 +133,11 @@
         Private slot to enable the search edit.
 </p><a NAME="HelpIndexWidget.__filterIndices" ID="HelpIndexWidget.__filterIndices"></a>
 <h4>HelpIndexWidget.__filterIndices</h4>
-<b>__filterIndices</b>(<i>filter</i>)
+<b>__filterIndices</b>(<i>filterStr</i>)
 <p>
         Private slot to filter the indices according to the given filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 filter to be used (string)
 </dd>
--- a/Documentation/Source/eric6.Helpviewer.History.HistoryFilterModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.History.HistoryFilterModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -292,7 +292,7 @@
 </dd>
 </dl><a NAME="HistoryFilterModel.columnCount" ID="HistoryFilterModel.columnCount"></a>
 <h4>HistoryFilterModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -376,7 +376,7 @@
 </dd>
 </dl><a NAME="HistoryFilterModel.index" ID="HistoryFilterModel.index"></a>
 <h4>HistoryFilterModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -447,7 +447,7 @@
         Public method to recalculate the frequencies.
 </p><a NAME="HistoryFilterModel.removeRows" ID="HistoryFilterModel.removeRows"></a>
 <h4>HistoryFilterModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -468,7 +468,7 @@
 </dd>
 </dl><a NAME="HistoryFilterModel.rowCount" ID="HistoryFilterModel.rowCount"></a>
 <h4>HistoryFilterModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.History.HistoryMenu.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.History.HistoryMenu.html	Fri Apr 07 18:33:59 2017 +0200
@@ -262,7 +262,7 @@
 </dd>
 </dl><a NAME="HistoryMenuModel.columnCount" ID="HistoryMenuModel.columnCount"></a>
 <h4>HistoryMenuModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -277,7 +277,7 @@
 </dd>
 </dl><a NAME="HistoryMenuModel.index" ID="HistoryMenuModel.index"></a>
 <h4>HistoryMenuModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -358,7 +358,7 @@
 </dd>
 </dl><a NAME="HistoryMenuModel.rowCount" ID="HistoryMenuModel.rowCount"></a>
 <h4>HistoryMenuModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.History.HistoryModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.History.HistoryModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -105,7 +105,7 @@
 </dd>
 </dl><a NAME="HistoryModel.columnCount" ID="HistoryModel.columnCount"></a>
 <h4>HistoryModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -179,7 +179,7 @@
         Public slot to reset the model.
 </p><a NAME="HistoryModel.removeRows" ID="HistoryModel.removeRows"></a>
 <h4>HistoryModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove history entries from the model.
 </p><dl>
@@ -200,7 +200,7 @@
 </dd>
 </dl><a NAME="HistoryModel.rowCount" ID="HistoryModel.rowCount"></a>
 <h4>HistoryModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.History.HistoryTreeModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.History.HistoryTreeModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -181,7 +181,7 @@
 </dd>
 </dl><a NAME="HistoryTreeModel.columnCount" ID="HistoryTreeModel.columnCount"></a>
 <h4>HistoryTreeModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -229,7 +229,7 @@
 </dd>
 </dl><a NAME="HistoryTreeModel.hasChildren" ID="HistoryTreeModel.hasChildren"></a>
 <h4>HistoryTreeModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check, if an entry has some children.
 </p><dl>
@@ -265,7 +265,7 @@
 </dd>
 </dl><a NAME="HistoryTreeModel.index" ID="HistoryTreeModel.index"></a>
 <h4>HistoryTreeModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -331,7 +331,7 @@
 </dd>
 </dl><a NAME="HistoryTreeModel.removeRows" ID="HistoryTreeModel.removeRows"></a>
 <h4>HistoryTreeModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -352,7 +352,7 @@
 </dd>
 </dl><a NAME="HistoryTreeModel.rowCount" ID="HistoryTreeModel.rowCount"></a>
 <h4>HistoryTreeModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.OfflineStorage.WebDatabasesModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.OfflineStorage.WebDatabasesModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -119,7 +119,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.columnCount" ID="WebDatabasesModel.columnCount"></a>
 <h4>WebDatabasesModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -152,7 +152,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.hasChildren" ID="WebDatabasesModel.hasChildren"></a>
 <h4>WebDatabasesModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check, if a parent node has some children.
 </p><dl>
@@ -188,7 +188,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.index" ID="WebDatabasesModel.index"></a>
 <h4>WebDatabasesModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to get a model index for an entry.
 </p><dl>
@@ -209,7 +209,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.parent" ID="WebDatabasesModel.parent"></a>
 <h4>WebDatabasesModel.parent</h4>
-<b>parent</b>(<i>index=QModelIndex()</i>)
+<b>parent</b>(<i>index=None</i>)
 <p>
         Public method to get the index of the parent entry.
 </p><dl>
@@ -224,7 +224,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.removeRows" ID="WebDatabasesModel.removeRows"></a>
 <h4>WebDatabasesModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove databases from the model.
 </p><dl>
@@ -245,7 +245,7 @@
 </dd>
 </dl><a NAME="WebDatabasesModel.rowCount" ID="WebDatabasesModel.rowCount"></a>
 <h4>WebDatabasesModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to determine the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.OpenSearch.OpenSearchEngineModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -110,13 +110,13 @@
         Private slot handling a change of the registered engines.
 </p><a NAME="OpenSearchEngineModel.columnCount" ID="OpenSearchEngineModel.columnCount"></a>
 <h4>OpenSearchEngineModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-parent index (QModelIndex)
+parent index (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -179,7 +179,7 @@
 </dd>
 </dl><a NAME="OpenSearchEngineModel.removeRows" ID="OpenSearchEngineModel.removeRows"></a>
 <h4>OpenSearchEngineModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -200,7 +200,7 @@
 </dd>
 </dl><a NAME="OpenSearchEngineModel.rowCount" ID="OpenSearchEngineModel.rowCount"></a>
 <h4>OpenSearchEngineModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.Passwords.PasswordModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.Passwords.PasswordModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -109,13 +109,13 @@
         Private slot handling a change of the registered passwords.
 </p><a NAME="PasswordModel.columnCount" ID="PasswordModel.columnCount"></a>
 <h4>PasswordModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-parent index (QModelIndex)
+parent index (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -163,7 +163,7 @@
 </dd>
 </dl><a NAME="PasswordModel.removeRows" ID="PasswordModel.removeRows"></a>
 <h4>PasswordModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -184,7 +184,7 @@
 </dd>
 </dl><a NAME="PasswordModel.rowCount" ID="PasswordModel.rowCount"></a>
 <h4>PasswordModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.UserAgent.UserAgentModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.UserAgent.UserAgentModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -103,13 +103,13 @@
         Private slot handling a change of the registered user agent strings.
 </p><a NAME="UserAgentModel.columnCount" ID="UserAgentModel.columnCount"></a>
 <h4>UserAgentModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-parent index (QModelIndex)
+parent index (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -157,7 +157,7 @@
 </dd>
 </dl><a NAME="UserAgentModel.removeRows" ID="UserAgentModel.removeRows"></a>
 <h4>UserAgentModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -178,7 +178,7 @@
 </dd>
 </dl><a NAME="UserAgentModel.rowCount" ID="UserAgentModel.rowCount"></a>
 <h4>UserAgentModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.Helpviewer.WebPlugins.ClickToFlash.ClickToFlash.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.WebPlugins.ClickToFlash.ClickToFlash.html	Fri Apr 07 18:33:59 2017 +0200
@@ -232,13 +232,13 @@
         Private slot to hide the object.
 </p><a NAME="ClickToFlash.__load" ID="ClickToFlash.__load"></a>
 <h4>ClickToFlash.__load</h4>
-<b>__load</b>(<i>all=False</i>)
+<b>__load</b>(<i>allPlayers=False</i>)
 <p>
         Private slot to load the flash content.
 </p><dl>
-<dt><i>all</i></dt>
+<dt><i>allPlayers</i></dt>
 <dd>
-flag indicating to load all flash players. (boolean)
+flag indicating to load all flash players (boolean)
 </dd>
 </dl><a NAME="ClickToFlash.__removeFromWhitelist" ID="ClickToFlash.__removeFromWhitelist"></a>
 <h4>ClickToFlash.__removeFromWhitelist</h4>
--- a/Documentation/Source/eric6.Helpviewer.ZoomManager.ZoomValuesModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Helpviewer.ZoomManager.ZoomValuesModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -103,13 +103,13 @@
         Private slot handling a change of the registered zoom values.
 </p><a NAME="ZoomValuesModel.columnCount" ID="ZoomValuesModel.columnCount"></a>
 <h4>ZoomValuesModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns of the model.
 </p><dl>
 <dt><i>parent</i></dt>
 <dd>
-parent index (QModelIndex)
+parent index (QModelIndex) (Unused)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -157,7 +157,7 @@
 </dd>
 </dl><a NAME="ZoomValuesModel.removeRows" ID="ZoomValuesModel.removeRows"></a>
 <h4>ZoomValuesModel.removeRows</h4>
-<b>removeRows</b>(<i>row, count, parent=QModelIndex()</i>)
+<b>removeRows</b>(<i>row, count, parent=None</i>)
 <p>
         Public method to remove entries from the model.
 </p><dl>
@@ -178,7 +178,7 @@
 </dd>
 </dl><a NAME="ZoomValuesModel.rowCount" ID="ZoomValuesModel.rowCount"></a>
 <h4>ZoomValuesModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows of the model.
 </p><dl>
--- a/Documentation/Source/eric6.HexEdit.HexEditSearchReplaceWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.HexEdit.HexEditSearchReplaceWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -178,14 +178,14 @@
 </dd>
 </dl><a NAME="HexEditSearchReplaceWidget.__bytearray2text" ID="HexEditSearchReplaceWidget.__bytearray2text"></a>
 <h4>HexEditSearchReplaceWidget.__bytearray2text</h4>
-<b>__bytearray2text</b>(<i>array, format</i>)
+<b>__bytearray2text</b>(<i>array, dataFormat</i>)
 <p>
         Private method to convert a byte array to a text.
 </p><dl>
 <dt><i>array</i> (bytearray)</dt>
 <dd>
 byte array to be converted
-</dd><dt><i>format</i> (str)</dt>
+</dd><dt><i>dataFormat</i> (str)</dt>
 <dd>
 format of the text
 </dd>
@@ -303,14 +303,14 @@
 </dd>
 </dl><a NAME="HexEditSearchReplaceWidget.__text2bytearray" ID="HexEditSearchReplaceWidget.__text2bytearray"></a>
 <h4>HexEditSearchReplaceWidget.__text2bytearray</h4>
-<b>__text2bytearray</b>(<i>txt, format</i>)
+<b>__text2bytearray</b>(<i>txt, dataFormat</i>)
 <p>
         Private method to convert a text to a byte array.
 </p><dl>
 <dt><i>txt</i> (str)</dt>
 <dd>
 text to be converted
-</dd><dt><i>format</i> (str)</dt>
+</dd><dt><i>dataFormat</i> (str)</dt>
 <dd>
 format of the text
 </dd>
--- a/Documentation/Source/eric6.HexEdit.HexEditWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.HexEdit.HexEditWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -1123,14 +1123,14 @@
 </dd>
 </dl><a NAME="HexEditWidget.replaceByteArray" ID="HexEditWidget.replaceByteArray"></a>
 <h4>HexEditWidget.replaceByteArray</h4>
-<b>replaceByteArray</b>(<i>pos, len, byteArray</i>)
+<b>replaceByteArray</b>(<i>pos, length, byteArray</i>)
 <p>
         Public method to replace bytes.
 </p><dl>
 <dt><i>pos</i> (int)</dt>
 <dd>
 position to replace the bytes at
-</dd><dt><i>len</i> (int)</dt>
+</dd><dt><i>length</i> (int)</dt>
 <dd>
 amount of bytes to replace
 </dd><dt><i>byteArray</i> (bytearray or QByteArray)</dt>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleAddBuiltinIgnoreDialog</h1>
+<p>
+Module implementing a dialog to enter the data for a built-in assignment to
+be ignored.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog">CodeStyleAddBuiltinIgnoreDialog</a></td>
+<td>Class implementing a dialog to enter the data for a built-in assignment to be ignored.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="CodeStyleAddBuiltinIgnoreDialog" ID="CodeStyleAddBuiltinIgnoreDialog"></a>
+<h2>CodeStyleAddBuiltinIgnoreDialog</h2>
+<p>
+    Class implementing a dialog to enter the data for a built-in assignment to
+    be ignored.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_CodeStyleAddBuiltinIgnoreDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog.__init__">CodeStyleAddBuiltinIgnoreDialog</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private slot to set the state of the OK button.</td>
+</tr><tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog.getData">getData</a></td>
+<td>Public method to get the entered data.</td>
+</tr><tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged">on_leftEdit_textChanged</a></td>
+<td>Private slot to handle a change of the text of the left side edit.</td>
+</tr><tr>
+<td><a href="#CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged">on_rightEdit_textChanged</a></td>
+<td>Private slot to handle a change of the text of the right side edit.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="CodeStyleAddBuiltinIgnoreDialog.__init__" ID="CodeStyleAddBuiltinIgnoreDialog.__init__"></a>
+<h4>CodeStyleAddBuiltinIgnoreDialog (Constructor)</h4>
+<b>CodeStyleAddBuiltinIgnoreDialog</b>(<i>parent=None</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd>
+</dl><a NAME="CodeStyleAddBuiltinIgnoreDialog.__updateOkButton" ID="CodeStyleAddBuiltinIgnoreDialog.__updateOkButton"></a>
+<h4>CodeStyleAddBuiltinIgnoreDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+<p>
+        Private slot to set the state of the OK button.
+</p><a NAME="CodeStyleAddBuiltinIgnoreDialog.getData" ID="CodeStyleAddBuiltinIgnoreDialog.getData"></a>
+<h4>CodeStyleAddBuiltinIgnoreDialog.getData</h4>
+<b>getData</b>(<i></i>)
+<p>
+        Public method to get the entered data.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containing the left and right hand side of the assignment
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of two str
+</dd>
+</dl><a NAME="CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged" ID="CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged"></a>
+<h4>CodeStyleAddBuiltinIgnoreDialog.on_leftEdit_textChanged</h4>
+<b>on_leftEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle a change of the text of the left side edit.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+text of the line edit
+</dd>
+</dl><a NAME="CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged" ID="CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged"></a>
+<h4>CodeStyleAddBuiltinIgnoreDialog.on_rightEdit_textChanged</h4>
+<b>on_rightEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle a change of the text of the right side edit.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+text of the line edit
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html	Fri Apr 07 18:33:59 2017 +0200
@@ -147,15 +147,17 @@
 arguments used by the codeStyleCheck function (list of
         excludeMessages (str), includeMessages (str), repeatMessages
         (bool), fixCodes (str), noFixCodes (str), fixIssues (bool),
-        maxLineLength (int), hangClosing (bool), docType (str), errors
-        (list of str), eol (str), encoding (str), backup (bool))
+        maxLineLength (int), hangClosing (bool), docType (str), dictionary
+        with arguments for the code complexity checker (dict), dictionary
+        with arguments for the miscellaneous checker (dict), errors (list
+        of str), eol (str), encoding (str), backup (bool))
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
 <dd>
-tuple of stats (dict) and results (tuple for each found violation
-        of style (tuple of lineno (int), position (int), text (str), ignored
-            (bool), fixed (bool), autofixing (bool), fixedMsg (str)))
+tuple of statistics (dict) and results (tuple for each found
+        violation of style (tuple of lineno (int), position (int), text (str),
+        ignored (bool), fixed (bool), autofixing (bool), fixedMsg (str)))
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -229,6 +231,9 @@
 </dd><dt><i>endComment=</i></dt>
 <dd>
 string identifying the end of a comment (string)
+</dd><dt><i>flagsLine=</i></dt>
+<dd>
+flag indicating to check for a flags only line (bool)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -266,14 +271,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleCheckerDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -75,6 +75,9 @@
 <td><a href="#CodeStyleCheckerDialog.__finish">__finish</a></td>
 <td>Private slot called when the code style check finished or the user pressed the cancel button.</td>
 </tr><tr>
+<td><a href="#CodeStyleCheckerDialog.__getBuiltinsIgnoreList">__getBuiltinsIgnoreList</a></td>
+<td>Private method to get a dictionary containing the builtins assignments to be ignored.</td>
+</tr><tr>
 <td><a href="#CodeStyleCheckerDialog.__getEol">__getEol</a></td>
 <td>Private method to get the applicable eol string.</td>
 </tr><tr>
@@ -84,6 +87,9 @@
 <td><a href="#CodeStyleCheckerDialog.__getSelectedFutureImports">__getSelectedFutureImports</a></td>
 <td>Private method to get the expected future imports.</td>
 </tr><tr>
+<td><a href="#CodeStyleCheckerDialog.__initBuiltinsIgnoreList">__initBuiltinsIgnoreList</a></td>
+<td>Private method to populate the list of shadowed builtins to be ignored.</td>
+</tr><tr>
 <td><a href="#CodeStyleCheckerDialog.__initFuturesList">__initFuturesList</a></td>
 <td>Private method to set the selected status of the future imports.</td>
 </tr><tr>
@@ -123,9 +129,18 @@
 <td><a href="#CodeStyleCheckerDialog.checkBatch">checkBatch</a></td>
 <td>Public method to start a style check batch job.</td>
 </tr><tr>
+<td><a href="#CodeStyleCheckerDialog.on_addBuiltinButton_clicked">on_addBuiltinButton_clicked</a></td>
+<td>Private slot to add a built-in assignment to be ignored.</td>
+</tr><tr>
+<td><a href="#CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged">on_builtinsAssignmentList_itemSelectionChanged</a></td>
+<td>Private slot to react upon changes of the selected builtin assignments.</td>
+</tr><tr>
 <td><a href="#CodeStyleCheckerDialog.on_buttonBox_clicked">on_buttonBox_clicked</a></td>
 <td>Private slot called by a button of the button box clicked.</td>
 </tr><tr>
+<td><a href="#CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked">on_deleteBuiltinButton_clicked</a></td>
+<td>Private slot to delete the selected items from the list.</td>
+</tr><tr>
 <td><a href="#CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked">on_excludeMessagesSelectButton_clicked</a></td>
 <td>Private slot to select the message codes to be excluded via a selection dialog.</td>
 </tr><tr>
@@ -259,7 +274,23 @@
 <p>
         Private slot called when the code style check finished or the user
         pressed the cancel button.
-</p><a NAME="CodeStyleCheckerDialog.__getEol" ID="CodeStyleCheckerDialog.__getEol"></a>
+</p><a NAME="CodeStyleCheckerDialog.__getBuiltinsIgnoreList" ID="CodeStyleCheckerDialog.__getBuiltinsIgnoreList"></a>
+<h4>CodeStyleCheckerDialog.__getBuiltinsIgnoreList</h4>
+<b>__getBuiltinsIgnoreList</b>(<i></i>)
+<p>
+        Private method to get a dictionary containing the builtins assignments
+        to be ignored.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+dictionary containing the builtins assignments to be ignored
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+dict of list of str
+</dd>
+</dl><a NAME="CodeStyleCheckerDialog.__getEol" ID="CodeStyleCheckerDialog.__getEol"></a>
 <h4>CodeStyleCheckerDialog.__getEol</h4>
 <b>__getEol</b>(<i>fn</i>)
 <p>
@@ -299,6 +330,17 @@
 <dd>
 str
 </dd>
+</dl><a NAME="CodeStyleCheckerDialog.__initBuiltinsIgnoreList" ID="CodeStyleCheckerDialog.__initBuiltinsIgnoreList"></a>
+<h4>CodeStyleCheckerDialog.__initBuiltinsIgnoreList</h4>
+<b>__initBuiltinsIgnoreList</b>(<i>builtinsIgnoreDict</i>)
+<p>
+        Private method to populate the list of shadowed builtins to be ignored.
+</p><dl>
+<dt><i>builtinsIgnoreDict</i> (dict of list of str)</dt>
+<dd>
+dictionary containing the builtins
+            assignments to be ignored
+</dd>
 </dl><a NAME="CodeStyleCheckerDialog.__initFuturesList" ID="CodeStyleCheckerDialog.__initFuturesList"></a>
 <h4>CodeStyleCheckerDialog.__initFuturesList</h4>
 <b>__initFuturesList</b>(<i>selectedFutures</i>)
@@ -464,6 +506,16 @@
         Public method to start a style check batch job.
 </p><p>
         The results are reported to the __processResult slot.
+</p><a NAME="CodeStyleCheckerDialog.on_addBuiltinButton_clicked" ID="CodeStyleCheckerDialog.on_addBuiltinButton_clicked"></a>
+<h4>CodeStyleCheckerDialog.on_addBuiltinButton_clicked</h4>
+<b>on_addBuiltinButton_clicked</b>(<i></i>)
+<p>
+        Private slot to add a built-in assignment to be ignored.
+</p><a NAME="CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged" ID="CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged"></a>
+<h4>CodeStyleCheckerDialog.on_builtinsAssignmentList_itemSelectionChanged</h4>
+<b>on_builtinsAssignmentList_itemSelectionChanged</b>(<i></i>)
+<p>
+        Private slot to react upon changes of the selected builtin assignments.
 </p><a NAME="CodeStyleCheckerDialog.on_buttonBox_clicked" ID="CodeStyleCheckerDialog.on_buttonBox_clicked"></a>
 <h4>CodeStyleCheckerDialog.on_buttonBox_clicked</h4>
 <b>on_buttonBox_clicked</b>(<i>button</i>)
@@ -474,7 +526,12 @@
 <dd>
 button that was clicked (QAbstractButton)
 </dd>
-</dl><a NAME="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked" ID="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked"></a>
+</dl><a NAME="CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked" ID="CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked"></a>
+<h4>CodeStyleCheckerDialog.on_deleteBuiltinButton_clicked</h4>
+<b>on_deleteBuiltinButton_clicked</b>(<i></i>)
+<p>
+        Private slot to delete the selected items from the list.
+</p><a NAME="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked" ID="CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked"></a>
 <h4>CodeStyleCheckerDialog.on_excludeMessagesSelectButton_clicked</h4>
 <b>on_excludeMessagesSelectButton_clicked</b>(<i></i>)
 <p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker.html	Fri Apr 07 18:33:59 2017 +0200
@@ -0,0 +1,262 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Plugins.CheckerPlugins.CodeStyleChecker.ComplexityChecker</h1>
+<p>
+Module implementing a checker for code complexity.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#ComplexityChecker">ComplexityChecker</a></td>
+<td>Class implementing a checker for code complexity.</td>
+</tr><tr>
+<td><a href="#LineComplexityVisitor">LineComplexityVisitor</a></td>
+<td>Class calculating the number of AST nodes per line of code and the median nodes/line score.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="ComplexityChecker" ID="ComplexityChecker"></a>
+<h2>ComplexityChecker</h2>
+<p>
+    Class implementing a checker for code complexity.
+</p>
+<h3>Derived from</h3>
+object
+<h3>Class Attributes</h3>
+<table>
+<tr><td>Codes</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#ComplexityChecker.__init__">ComplexityChecker</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.__checkLineComplexity">__checkLineComplexity</a></td>
+<td>Private method to check the complexity of a single line of code and the median line complexity of the source code.</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.__checkMcCabeComplexity">__checkMcCabeComplexity</a></td>
+<td>Private method to check the McCabe code complexity.</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.__error">__error</a></td>
+<td>Private method to record an issue.</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.__ignoreCode">__ignoreCode</a></td>
+<td>Private method to check if the message code should be ignored.</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.__reportInvalidSyntax">__reportInvalidSyntax</a></td>
+<td>Private method to report a syntax error.</td>
+</tr><tr>
+<td><a href="#ComplexityChecker.run">run</a></td>
+<td>Public method to check the given source for code complexity.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="ComplexityChecker.__init__" ID="ComplexityChecker.__init__"></a>
+<h4>ComplexityChecker (Constructor)</h4>
+<b>ComplexityChecker</b>(<i>source, filename, select, ignore, args</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>source</i> (list of str)</dt>
+<dd>
+source code to be checked
+</dd><dt><i>filename</i> (str)</dt>
+<dd>
+name of the source file
+</dd><dt><i>select</i> (list of str)</dt>
+<dd>
+list of selected codes
+</dd><dt><i>ignore</i> (list of str)</dt>
+<dd>
+list of codes to be ignored
+</dd><dt><i>args</i> (dict)</dt>
+<dd>
+dictionary of arguments for the miscellaneous checks
+</dd>
+</dl><a NAME="ComplexityChecker.__checkLineComplexity" ID="ComplexityChecker.__checkLineComplexity"></a>
+<h4>ComplexityChecker.__checkLineComplexity</h4>
+<b>__checkLineComplexity</b>(<i></i>)
+<p>
+        Private method to check the complexity of a single line of code and
+        the median line complexity of the source code.
+</p><p>
+        Complexity is defined as the number of AST nodes produced by a line
+        of code.
+</p><a NAME="ComplexityChecker.__checkMcCabeComplexity" ID="ComplexityChecker.__checkMcCabeComplexity"></a>
+<h4>ComplexityChecker.__checkMcCabeComplexity</h4>
+<b>__checkMcCabeComplexity</b>(<i></i>)
+<p>
+        Private method to check the McCabe code complexity.
+</p><a NAME="ComplexityChecker.__error" ID="ComplexityChecker.__error"></a>
+<h4>ComplexityChecker.__error</h4>
+<b>__error</b>(<i>lineNumber, offset, code, *args</i>)
+<p>
+        Private method to record an issue.
+</p><dl>
+<dt><i>lineNumber</i> (int)</dt>
+<dd>
+line number of the issue
+</dd><dt><i>offset</i> (int)</dt>
+<dd>
+position within line of the issue
+</dd><dt><i>code</i> (str)</dt>
+<dd>
+message code
+</dd><dt><i>args</i> (list)</dt>
+<dd>
+arguments for the message
+</dd>
+</dl><a NAME="ComplexityChecker.__ignoreCode" ID="ComplexityChecker.__ignoreCode"></a>
+<h4>ComplexityChecker.__ignoreCode</h4>
+<b>__ignoreCode</b>(<i>code</i>)
+<p>
+        Private method to check if the message code should be ignored.
+</p><dl>
+<dt><i>code</i> (str)</dt>
+<dd>
+message code to check for
+</dd>
+</dl><dl>
+<dt>Returns:</dt>
+<dd>
+flag indicating to ignore the given code
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+bool
+</dd>
+</dl><a NAME="ComplexityChecker.__reportInvalidSyntax" ID="ComplexityChecker.__reportInvalidSyntax"></a>
+<h4>ComplexityChecker.__reportInvalidSyntax</h4>
+<b>__reportInvalidSyntax</b>(<i></i>)
+<p>
+        Private method to report a syntax error.
+</p><a NAME="ComplexityChecker.run" ID="ComplexityChecker.run"></a>
+<h4>ComplexityChecker.run</h4>
+<b>run</b>(<i></i>)
+<p>
+        Public method to check the given source for code complexity.
+</p>
+<div align="right"><a href="#top">Up</a></div>
+<hr /><hr />
+<a NAME="LineComplexityVisitor" ID="LineComplexityVisitor"></a>
+<h2>LineComplexityVisitor</h2>
+<p>
+    Class calculating the number of AST nodes per line of code
+    and the median nodes/line score.
+</p>
+<h3>Derived from</h3>
+ast.NodeVisitor
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#LineComplexityVisitor.__init__">LineComplexityVisitor</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#LineComplexityVisitor.score">score</a></td>
+<td>Public method to calculate the median.</td>
+</tr><tr>
+<td><a href="#LineComplexityVisitor.sortedList">sortedList</a></td>
+<td>Public method to get a sorted list of (line, nodes) tuples.</td>
+</tr><tr>
+<td><a href="#LineComplexityVisitor.visit">visit</a></td>
+<td>Public method to recursively visit all the nodes and add up the instructions.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="LineComplexityVisitor.__init__" ID="LineComplexityVisitor.__init__"></a>
+<h4>LineComplexityVisitor (Constructor)</h4>
+<b>LineComplexityVisitor</b>(<i></i>)
+<p>
+        Constructor
+</p><a NAME="LineComplexityVisitor.score" ID="LineComplexityVisitor.score"></a>
+<h4>LineComplexityVisitor.score</h4>
+<b>score</b>(<i></i>)
+<p>
+        Public method to calculate the median.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+median line complexity value
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+float
+</dd>
+</dl><a NAME="LineComplexityVisitor.sortedList" ID="LineComplexityVisitor.sortedList"></a>
+<h4>LineComplexityVisitor.sortedList</h4>
+<b>sortedList</b>(<i></i>)
+<p>
+        Public method to get a sorted list of (line, nodes) tuples.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+sorted list of (line, nodes) tuples
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+list of tuple of (int,int)
+</dd>
+</dl><a NAME="LineComplexityVisitor.visit" ID="LineComplexityVisitor.visit"></a>
+<h4>LineComplexityVisitor.visit</h4>
+<b>visit</b>(<i>node</i>)
+<p>
+        Public method to recursively visit all the nodes and add up the
+        instructions.
+</p><dl>
+<dt><i>node</i> (ast.AST)</dt>
+<dd>
+reference to the node
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker.html	Thu Mar 23 18:58:56 2017 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker</title>
-<meta charset="UTF-8">
-<style>
-body {
-    background: #EDECE6;
-    margin: 0em 1em 10em 1em;
-    color: black;
-}
-
-h1 { color: white; background: #85774A; }
-h2 { color: white; background: #85774A; }
-h3 { color: white; background: #9D936E; }
-h4 { color: white; background: #9D936E; }
-    
-a { color: #BA6D36; }
-
-</style>
-</head>
-<body><a NAME="top" ID="top"></a>
-<h1>eric6.Plugins.CheckerPlugins.CodeStyleChecker.McCabeChecker</h1>
-<p>
-Module implementing a checker for code complexity.
-</p>
-<h3>Global Attributes</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Classes</h3>
-<table>
-<tr>
-<td><a href="#McCabeChecker">McCabeChecker</a></td>
-<td>Class implementing a checker for code complexity iaw.</td>
-</tr>
-</table>
-<h3>Functions</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<hr /><hr />
-<a NAME="McCabeChecker" ID="McCabeChecker"></a>
-<h2>McCabeChecker</h2>
-<p>
-    Class implementing a checker for code complexity iaw. McCabe.
-</p>
-<h3>Derived from</h3>
-object
-<h3>Class Attributes</h3>
-<table>
-<tr><td>Codes</td></tr>
-</table>
-<h3>Class Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<h3>Methods</h3>
-<table>
-<tr>
-<td><a href="#McCabeChecker.__init__">McCabeChecker</a></td>
-<td>Constructor</td>
-</tr><tr>
-<td><a href="#McCabeChecker.__error">__error</a></td>
-<td>Private method to record an issue.</td>
-</tr><tr>
-<td><a href="#McCabeChecker.__ignoreCode">__ignoreCode</a></td>
-<td>Private method to check if the error code should be ignored.</td>
-</tr><tr>
-<td><a href="#McCabeChecker.__reportInvalidSyntax">__reportInvalidSyntax</a></td>
-<td>Private method to report a syntax error.</td>
-</tr><tr>
-<td><a href="#McCabeChecker.run">run</a></td>
-<td>Public method to check the given source for code complexity.</td>
-</tr>
-</table>
-<h3>Static Methods</h3>
-<table>
-<tr><td>None</td></tr>
-</table>
-<a NAME="McCabeChecker.__init__" ID="McCabeChecker.__init__"></a>
-<h4>McCabeChecker (Constructor)</h4>
-<b>McCabeChecker</b>(<i>source, filename, select, ignore, maxComplexity=10</i>)
-<p>
-        Constructor
-</p><dl>
-<dt><i>source</i> (list of str)</dt>
-<dd>
-source code to be checked
-</dd><dt><i>filename</i> (str)</dt>
-<dd>
-name of the source file
-</dd><dt><i>select</i> (list of str)</dt>
-<dd>
-list of selected codes
-</dd><dt><i>ignore</i> (list of str)</dt>
-<dd>
-list of codes to be ignored
-</dd><dt><i>maxComplexity</i> (int)</dt>
-<dd>
-maximum allowed complexity value
-</dd>
-</dl><a NAME="McCabeChecker.__error" ID="McCabeChecker.__error"></a>
-<h4>McCabeChecker.__error</h4>
-<b>__error</b>(<i>lineNumber, offset, code, *args</i>)
-<p>
-        Private method to record an issue.
-</p><dl>
-<dt><i>lineNumber</i> (int)</dt>
-<dd>
-line number of the issue
-</dd><dt><i>offset</i> (int)</dt>
-<dd>
-position within line of the issue
-</dd><dt><i>code</i> (str)</dt>
-<dd>
-message code
-</dd><dt><i>args</i> (list)</dt>
-<dd>
-arguments for the message
-</dd>
-</dl><a NAME="McCabeChecker.__ignoreCode" ID="McCabeChecker.__ignoreCode"></a>
-<h4>McCabeChecker.__ignoreCode</h4>
-<b>__ignoreCode</b>(<i>code</i>)
-<p>
-        Private method to check if the error code should be ignored.
-</p><dl>
-<dt><i>code</i></dt>
-<dd>
-message code to check for (string)
-</dd>
-</dl><dl>
-<dt>Returns:</dt>
-<dd>
-flag indicating to ignore the given code (boolean)
-</dd>
-</dl><a NAME="McCabeChecker.__reportInvalidSyntax" ID="McCabeChecker.__reportInvalidSyntax"></a>
-<h4>McCabeChecker.__reportInvalidSyntax</h4>
-<b>__reportInvalidSyntax</b>(<i></i>)
-<p>
-        Private method to report a syntax error.
-</p><a NAME="McCabeChecker.run" ID="McCabeChecker.run"></a>
-<h4>McCabeChecker.run</h4>
-<b>run</b>(<i></i>)
-<p>
-        Public method to check the given source for code complexity.
-</p>
-<div align="right"><a href="#top">Up</a></div>
-<hr />
-</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.MiscellaneousChecker.html	Fri Apr 07 18:33:59 2017 +0200
@@ -51,7 +51,7 @@
 object
 <h3>Class Attributes</h3>
 <table>
-<tr><td>Codes</td></tr><tr><td>FormatFieldRegex</td></tr><tr><td>Formatter</td></tr>
+<tr><td>BuiltinsWhiteList</td></tr><tr><td>Codes</td></tr><tr><td>FormatFieldRegex</td></tr><tr><td>Formatter</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -63,12 +63,15 @@
 <td><a href="#MiscellaneousChecker.__init__">MiscellaneousChecker</a></td>
 <td>Constructor</td>
 </tr><tr>
-<td><a href="#MiscellaneousChecker.__checkBlindExcept">__checkBlindExcept</a></td>
-<td>Private method to check for blind except statements.</td>
+<td><a href="#MiscellaneousChecker.__checkBuiltins">__checkBuiltins</a></td>
+<td>Private method to check, if built-ins are shadowed.</td>
 </tr><tr>
 <td><a href="#MiscellaneousChecker.__checkCoding">__checkCoding</a></td>
 <td>Private method to check the presence of a coding line and valid encodings.</td>
 </tr><tr>
+<td><a href="#MiscellaneousChecker.__checkComprehensions">__checkComprehensions</a></td>
+<td>Private method to check some comprehension related things.</td>
+</tr><tr>
 <td><a href="#MiscellaneousChecker.__checkCopyright">__checkCopyright</a></td>
 <td>Private method to check the presence of a copyright statement.</td>
 </tr><tr>
@@ -78,6 +81,9 @@
 <td><a href="#MiscellaneousChecker.__checkFuture">__checkFuture</a></td>
 <td>Private method to check the __future__ imports.</td>
 </tr><tr>
+<td><a href="#MiscellaneousChecker.__checkMutableDefault">__checkMutableDefault</a></td>
+<td>Private method to check for use of mutable types as default arguments.</td>
+</tr><tr>
 <td><a href="#MiscellaneousChecker.__checkPep3101">__checkPep3101</a></td>
 <td>Private method to check for old style string formatting.</td>
 </tr><tr>
@@ -138,17 +144,22 @@
 <dd>
 dictionary of arguments for the miscellaneous checks
 </dd>
-</dl><a NAME="MiscellaneousChecker.__checkBlindExcept" ID="MiscellaneousChecker.__checkBlindExcept"></a>
-<h4>MiscellaneousChecker.__checkBlindExcept</h4>
-<b>__checkBlindExcept</b>(<i></i>)
+</dl><a NAME="MiscellaneousChecker.__checkBuiltins" ID="MiscellaneousChecker.__checkBuiltins"></a>
+<h4>MiscellaneousChecker.__checkBuiltins</h4>
+<b>__checkBuiltins</b>(<i></i>)
 <p>
-        Private method to check for blind except statements.
+        Private method to check, if built-ins are shadowed.
 </p><a NAME="MiscellaneousChecker.__checkCoding" ID="MiscellaneousChecker.__checkCoding"></a>
 <h4>MiscellaneousChecker.__checkCoding</h4>
 <b>__checkCoding</b>(<i></i>)
 <p>
         Private method to check the presence of a coding line and valid
         encodings.
+</p><a NAME="MiscellaneousChecker.__checkComprehensions" ID="MiscellaneousChecker.__checkComprehensions"></a>
+<h4>MiscellaneousChecker.__checkComprehensions</h4>
+<b>__checkComprehensions</b>(<i></i>)
+<p>
+        Private method to check some comprehension related things.
 </p><a NAME="MiscellaneousChecker.__checkCopyright" ID="MiscellaneousChecker.__checkCopyright"></a>
 <h4>MiscellaneousChecker.__checkCopyright</h4>
 <b>__checkCopyright</b>(<i></i>)
@@ -164,6 +175,11 @@
 <b>__checkFuture</b>(<i></i>)
 <p>
         Private method to check the __future__ imports.
+</p><a NAME="MiscellaneousChecker.__checkMutableDefault" ID="MiscellaneousChecker.__checkMutableDefault"></a>
+<h4>MiscellaneousChecker.__checkMutableDefault</h4>
+<b>__checkMutableDefault</b>(<i></i>)
+<p>
+        Private method to check for use of mutable types as default arguments.
 </p><a NAME="MiscellaneousChecker.__checkPep3101" ID="MiscellaneousChecker.__checkPep3101"></a>
 <h4>MiscellaneousChecker.__checkPep3101</h4>
 <b>__checkPep3101</b>(<i></i>)
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.NamingStyleChecker.html	Fri Apr 07 18:33:59 2017 +0200
@@ -66,7 +66,7 @@
 <td><a href="#NamingStyleChecker.__checkFunctionArgumentNames">__checkFunctionArgumentNames</a></td>
 <td>Private class to check the argument names of functions (N803, N804, N805, N806).</td>
 </tr><tr>
-<td><a href="#NamingStyleChecker.__checkFuntionName">__checkFuntionName</a></td>
+<td><a href="#NamingStyleChecker.__checkFunctionName">__checkFunctionName</a></td>
 <td>Private class to check the given node for function name conventions (N802).</td>
 </tr><tr>
 <td><a href="#NamingStyleChecker.__checkImportAs">__checkImportAs</a></td>
@@ -176,9 +176,9 @@
 tuple giving line number, offset within line and error code
             (integer, integer, string)
 </dd>
-</dl><a NAME="NamingStyleChecker.__checkFuntionName" ID="NamingStyleChecker.__checkFuntionName"></a>
-<h4>NamingStyleChecker.__checkFuntionName</h4>
-<b>__checkFuntionName</b>(<i>node, parents</i>)
+</dl><a NAME="NamingStyleChecker.__checkFunctionName" ID="NamingStyleChecker.__checkFunctionName"></a>
+<h4>NamingStyleChecker.__checkFunctionName</h4>
+<b>__checkFunctionName</b>(<i>node, parents</i>)
 <p>
         Private class to check the given node for function name
         conventions (N802).
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html	Fri Apr 07 18:33:59 2017 +0200
@@ -133,7 +133,7 @@
 </table>
 <a NAME="PathGraph.__init__" ID="PathGraph.__init__"></a>
 <h4>PathGraph (Constructor)</h4>
-<b>PathGraph</b>(<i>name, entity, lineno</i>)
+<b>PathGraph</b>(<i>name, entity, lineno, column=0</i>)
 <a NAME="PathGraph.complexity" ID="PathGraph.complexity"></a>
 <h4>PathGraph.complexity</h4>
 <b>complexity</b>(<i></i>)
@@ -159,7 +159,7 @@
 ASTVisitor
 <h3>Class Attributes</h3>
 <table>
-<tr><td>visitAssert</td></tr><tr><td>visitAsyncFunctionDef</td></tr><tr><td>visitAsyncWith</td></tr><tr><td>visitFor</td></tr><tr><td>visitTry</td></tr>
+<tr><td>visitAsyncFor</td></tr><tr><td>visitAsyncFunctionDef</td></tr><tr><td>visitAsyncWith</td></tr><tr><td>visitTry</td></tr>
 </table>
 <h3>Class Methods</h3>
 <table>
@@ -180,6 +180,9 @@
 <td><a href="#PathGraphingAstVisitor.appendPathNode">appendPathNode</a></td>
 <td></td>
 </tr><tr>
+<td><a href="#PathGraphingAstVisitor.default">default</a></td>
+<td></td>
+</tr><tr>
 <td><a href="#PathGraphingAstVisitor.dispatch_list">dispatch_list</a></td>
 <td></td>
 </tr><tr>
@@ -228,6 +231,9 @@
 </p><a NAME="PathGraphingAstVisitor.appendPathNode" ID="PathGraphingAstVisitor.appendPathNode"></a>
 <h4>PathGraphingAstVisitor.appendPathNode</h4>
 <b>appendPathNode</b>(<i>name</i>)
+<a NAME="PathGraphingAstVisitor.default" ID="PathGraphingAstVisitor.default"></a>
+<h4>PathGraphingAstVisitor.default</h4>
+<b>default</b>(<i>node, *args</i>)
 <a NAME="PathGraphingAstVisitor.dispatch_list" ID="PathGraphingAstVisitor.dispatch_list"></a>
 <h4>PathGraphingAstVisitor.dispatch_list</h4>
 <b>dispatch_list</b>(<i>node_list</i>)
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html	Fri Apr 07 18:33:59 2017 +0200
@@ -108,6 +108,9 @@
 </dd><dt><i>endComment=</i></dt>
 <dd>
 string identifying the end of a comment (string)
+</dd><dt><i>flagsLine=</i></dt>
+<dd>
+flag indicating to check for a flags only line (bool)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -219,14 +222,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html	Fri Apr 07 18:33:59 2017 +0200
@@ -175,14 +175,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html	Fri Apr 07 18:33:59 2017 +0200
@@ -461,14 +461,14 @@
 <hr /><hr />
 <a NAME="worker" ID="worker"></a>
 <h2>worker</h2>
-<b>worker</b>(<i>input, output</i>)
+<b>worker</b>(<i>inputQueue, outputQueue</i>)
 <p>
     Module function acting as the parallel worker for the style check.
 </p><dl>
-<dt><i>input</i></dt>
+<dt><i>inputQueue</i></dt>
 <dd>
 input queue (multiprocessing.Queue)
-</dd><dt><i>output</i></dt>
+</dd><dt><i>outputQueue</i></dt>
 <dd>
 output queue (multiprocessing.Queue)
 </dd>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgBundleDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -97,22 +97,25 @@
 </table>
 <a NAME="HgBundleDialog.__init__" ID="HgBundleDialog.__init__"></a>
 <h4>HgBundleDialog (Constructor)</h4>
-<b>HgBundleDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>)
+<b>HgBundleDialog</b>(<i>tagsList, branchesList, bookmarksList=None, version=(0, 0, 0), parent=None</i>)
 <p>
         Constructor
 </p><dl>
-<dt><i>tagsList</i></dt>
+<dt><i>tagsList</i> (list of str)</dt>
 <dd>
-list of tags (list of strings)
-</dd><dt><i>branchesList</i></dt>
+list of tags
+</dd><dt><i>branchesList</i> (list of str)</dt>
+<dd>
+list of branches
+</dd><dt><i>bookmarksList</i> (list of str)</dt>
 <dd>
-list of branches (list of strings)
-</dd><dt><i>bookmarksList</i></dt>
+list of bookmarks
+</dd><dt><i>version</i> (tuple of three integers)</dt>
 <dd>
-list of bookmarks (list of strings)
-</dd><dt><i>parent</i></dt>
+Mercurial version info
+</dd><dt><i>parent</i> (QWidget)</dt>
 <dd>
-parent widget (QWidget)
+parent widget
 </dd>
 </dl><a NAME="HgBundleDialog.__updateOK" ID="HgBundleDialog.__updateOK"></a>
 <h4>HgBundleDialog.__updateOK</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgClient.html	Fri Apr 07 18:33:59 2017 +0200
@@ -258,7 +258,7 @@
 </dd>
 </dl><a NAME="HgClient.runcommand" ID="HgClient.runcommand"></a>
 <h4>HgClient.runcommand</h4>
-<b>runcommand</b>(<i>args, prompt=None, input=None, output=None, error=None</i>)
+<b>runcommand</b>(<i>args, prompt=None, inputData=None, output=None, error=None</i>)
 <p>
         Public method to execute a command via the command server.
 </p><dl>
@@ -270,10 +270,10 @@
 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.
-</dd><dt><i>input=</i></dt>
+</dd><dt><i>inputData=</i></dt>
 <dd>
-function to reply to bulk data requests by the server.
-            It receives the max number of bytes to return.
+function to reply to bulk data requests by the
+            server. It receives the max number of bytes to return.
 </dd><dt><i>output=</i></dt>
 <dd>
 function receiving the data from the server (string).
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -262,7 +262,7 @@
         Private slot to send the input to the subversion process.
 </p><a NAME="HgDialog.startProcess" ID="HgDialog.startProcess"></a>
 <h4>HgDialog.startProcess</h4>
-<b>startProcess</b>(<i>args, workingDir=None, showArgs=True, environment={}</i>)
+<b>startProcess</b>(<i>args, workingDir=None, showArgs=True, environment=None</i>)
 <p>
         Public slot used to start the process.
 </p><dl>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -63,18 +63,30 @@
 <td><a href="#HgUserConfigDialog.__assembleFingerprints">__assembleFingerprints</a></td>
 <td>Private method to assemble a list of host fingerprints.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__assembleMinimumProtocols">__assembleMinimumProtocols</a></td>
+<td>Private method to assemble a list of host minimum protocols.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.__clearDialog">__clearDialog</a></td>
 <td>Private method to clear the data of the dialog.</td>
 </tr><tr>
 <td><a href="#HgUserConfigDialog.__clearFingerprints">__clearFingerprints</a></td>
 <td>Private method to clear the fingerprints from the hostsecurity section.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__clearMinimumProtocols">__clearMinimumProtocols</a></td>
+<td>Private method to clear the minimum protocols from the hostsecurity section.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.__finalizeFingerprintsColumns">__finalizeFingerprintsColumns</a></td>
 <td>Private method to resize and sort the host fingerprints columns.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__finalizeProtocolsColumns">__finalizeProtocolsColumns</a></td>
+<td>Private method to resize and sort the host fingerprints columns.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.__updateFingerprintsButtons">__updateFingerprintsButtons</a></td>
 <td>Private slot to update the host fingerprints edit buttons.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.__updateProtocolsButtons">__updateProtocolsButtons</a></td>
+<td>Private slot to update the host minimum protocol edit buttons.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.accept">accept</a></td>
 <td>Public slot to accept the dialog.</td>
 </tr><tr>
@@ -96,6 +108,18 @@
 <td><a href="#HgUserConfigDialog.on_fpEditButton_clicked">on_fpEditButton_clicked</a></td>
 <td>Private slot to edit the current fingerprints item.</td>
 </tr><tr>
+<td><a href="#HgUserConfigDialog.on_protocolAddButton_clicked">on_protocolAddButton_clicked</a></td>
+<td>Private slot to add a minimum protocol entry.</td>
+</tr><tr>
+<td><a href="#HgUserConfigDialog.on_protocolDeleteButton_clicked">on_protocolDeleteButton_clicked</a></td>
+<td>Private slot to delete the current minimum protocol item.</td>
+</tr><tr>
+<td><a href="#HgUserConfigDialog.on_protocolEditButton_clicked">on_protocolEditButton_clicked</a></td>
+<td>Private slot to edit the current minimum protocol item.</td>
+</tr><tr>
+<td><a href="#HgUserConfigDialog.on_protocolsList_currentItemChanged">on_protocolsList_currentItemChanged</a></td>
+<td>Private slot handling a change of the current minimum protocol item.</td>
+</tr><tr>
 <td><a href="#HgUserConfigDialog.readUserConfig">readUserConfig</a></td>
 <td>Public method to read the user configuration file.</td>
 </tr><tr>
@@ -135,6 +159,21 @@
 <dd>
 dict with str as key and list of str as value
 </dd>
+</dl><a NAME="HgUserConfigDialog.__assembleMinimumProtocols" ID="HgUserConfigDialog.__assembleMinimumProtocols"></a>
+<h4>HgUserConfigDialog.__assembleMinimumProtocols</h4>
+<b>__assembleMinimumProtocols</b>(<i></i>)
+<p>
+        Private method to assemble a list of host minimum protocols.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+dictionary with list of minimum protocol per host
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+dict with str as key and str as value
+</dd>
 </dl><a NAME="HgUserConfigDialog.__clearDialog" ID="HgUserConfigDialog.__clearDialog"></a>
 <h4>HgUserConfigDialog.__clearDialog</h4>
 <b>__clearDialog</b>(<i></i>)
@@ -145,16 +184,32 @@
 <b>__clearFingerprints</b>(<i></i>)
 <p>
         Private method to clear the fingerprints from the hostsecurity section.
+</p><a NAME="HgUserConfigDialog.__clearMinimumProtocols" ID="HgUserConfigDialog.__clearMinimumProtocols"></a>
+<h4>HgUserConfigDialog.__clearMinimumProtocols</h4>
+<b>__clearMinimumProtocols</b>(<i></i>)
+<p>
+        Private method to clear the minimum protocols from the hostsecurity
+        section.
 </p><a NAME="HgUserConfigDialog.__finalizeFingerprintsColumns" ID="HgUserConfigDialog.__finalizeFingerprintsColumns"></a>
 <h4>HgUserConfigDialog.__finalizeFingerprintsColumns</h4>
 <b>__finalizeFingerprintsColumns</b>(<i></i>)
 <p>
         Private method to resize and sort the host fingerprints columns.
+</p><a NAME="HgUserConfigDialog.__finalizeProtocolsColumns" ID="HgUserConfigDialog.__finalizeProtocolsColumns"></a>
+<h4>HgUserConfigDialog.__finalizeProtocolsColumns</h4>
+<b>__finalizeProtocolsColumns</b>(<i></i>)
+<p>
+        Private method to resize and sort the host fingerprints columns.
 </p><a NAME="HgUserConfigDialog.__updateFingerprintsButtons" ID="HgUserConfigDialog.__updateFingerprintsButtons"></a>
 <h4>HgUserConfigDialog.__updateFingerprintsButtons</h4>
 <b>__updateFingerprintsButtons</b>(<i></i>)
 <p>
         Private slot to update the host fingerprints edit buttons.
+</p><a NAME="HgUserConfigDialog.__updateProtocolsButtons" ID="HgUserConfigDialog.__updateProtocolsButtons"></a>
+<h4>HgUserConfigDialog.__updateProtocolsButtons</h4>
+<b>__updateProtocolsButtons</b>(<i></i>)
+<p>
+        Private slot to update the host minimum protocol edit buttons.
 </p><a NAME="HgUserConfigDialog.accept" ID="HgUserConfigDialog.accept"></a>
 <h4>HgUserConfigDialog.accept</h4>
 <b>accept</b>(<i></i>)
@@ -216,7 +271,35 @@
 <b>on_fpEditButton_clicked</b>(<i></i>)
 <p>
         Private slot to edit the current fingerprints item.
-</p><a NAME="HgUserConfigDialog.readUserConfig" ID="HgUserConfigDialog.readUserConfig"></a>
+</p><a NAME="HgUserConfigDialog.on_protocolAddButton_clicked" ID="HgUserConfigDialog.on_protocolAddButton_clicked"></a>
+<h4>HgUserConfigDialog.on_protocolAddButton_clicked</h4>
+<b>on_protocolAddButton_clicked</b>(<i></i>)
+<p>
+        Private slot to add a minimum protocol entry.
+</p><a NAME="HgUserConfigDialog.on_protocolDeleteButton_clicked" ID="HgUserConfigDialog.on_protocolDeleteButton_clicked"></a>
+<h4>HgUserConfigDialog.on_protocolDeleteButton_clicked</h4>
+<b>on_protocolDeleteButton_clicked</b>(<i></i>)
+<p>
+        Private slot to delete the current minimum protocol item.
+</p><a NAME="HgUserConfigDialog.on_protocolEditButton_clicked" ID="HgUserConfigDialog.on_protocolEditButton_clicked"></a>
+<h4>HgUserConfigDialog.on_protocolEditButton_clicked</h4>
+<b>on_protocolEditButton_clicked</b>(<i></i>)
+<p>
+        Private slot to edit the current minimum protocol item.
+</p><a NAME="HgUserConfigDialog.on_protocolsList_currentItemChanged" ID="HgUserConfigDialog.on_protocolsList_currentItemChanged"></a>
+<h4>HgUserConfigDialog.on_protocolsList_currentItemChanged</h4>
+<b>on_protocolsList_currentItemChanged</b>(<i>current, previous</i>)
+<p>
+        Private slot handling a change of the current minimum protocol item.
+</p><dl>
+<dt><i>current</i> (QTreeWidgetItem)</dt>
+<dd>
+reference to the current item
+</dd><dt><i>previous</i> (QTreeWidgetItem)</dt>
+<dd>
+reference to the previous current item
+</dd>
+</dl><a NAME="HgUserConfigDialog.readUserConfig" ID="HgUserConfigDialog.readUserConfig"></a>
 <h4>HgUserConfigDialog.readUserConfig</h4>
 <b>readUserConfig</b>(<i></i>)
 <p>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog</title>
+<meta charset="UTF-8">
+<style>
+body {
+    background: #EDECE6;
+    margin: 0em 1em 10em 1em;
+    color: black;
+}
+
+h1 { color: white; background: #85774A; }
+h2 { color: white; background: #85774A; }
+h3 { color: white; background: #9D936E; }
+h4 { color: white; background: #9D936E; }
+    
+a { color: #BA6D36; }
+
+</style>
+</head>
+<body><a NAME="top" ID="top"></a>
+<h1>eric6.Plugins.VcsPlugins.vcsMercurial.HgUserConfigHostMinimumProtocolDialog</h1>
+<p>
+Module implementing a dialog to enter the minimum protocol for a host.
+</p>
+<h3>Global Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+<table>
+<tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog">HgUserConfigHostMinimumProtocolDialog</a></td>
+<td>Class implementing a dialog to enter the minimum protocol for a host.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr /><hr />
+<a NAME="HgUserConfigHostMinimumProtocolDialog" ID="HgUserConfigHostMinimumProtocolDialog"></a>
+<h2>HgUserConfigHostMinimumProtocolDialog</h2>
+<p>
+    Class implementing a dialog to enter the minimum protocol for a host.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_HgUserConfigHostMinimumProtocolDialog
+<h3>Class Attributes</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Class Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+<table>
+<tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog.__init__">HgUserConfigHostMinimumProtocolDialog</a></td>
+<td>Constructor</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private method to update the status of the Ok button.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog.getData">getData</a></td>
+<td>Public method to retrieve the data.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged">on_hostEdit_textChanged</a></td>
+<td>Private slot to handle changes of the host edit.</td>
+</tr><tr>
+<td><a href="#HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged">on_minimumProtocolComboBox_currentIndexChanged</a></td>
+<td>Private slot to handle the selection of a minimum protocol.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+<table>
+<tr><td>None</td></tr>
+</table>
+<a NAME="HgUserConfigHostMinimumProtocolDialog.__init__" ID="HgUserConfigHostMinimumProtocolDialog.__init__"></a>
+<h4>HgUserConfigHostMinimumProtocolDialog (Constructor)</h4>
+<b>HgUserConfigHostMinimumProtocolDialog</b>(<i>allowedProtocols, parent=None, host="", protocol=""</i>)
+<p>
+        Constructor
+</p><dl>
+<dt><i>allowedProtocols</i> (dict)</dt>
+<dd>
+dictionary containing the allowed protocols
+            with the value as key and the display string as value
+</dd><dt><i>parent</i> (QWidget)</dt>
+<dd>
+reference to the parent widget
+</dd><dt><i>host</i> (str)</dt>
+<dd>
+host name
+</dd><dt><i>protocol</i> (str)</dt>
+<dd>
+name of the minimum protocol for the host
+</dd>
+</dl><a NAME="HgUserConfigHostMinimumProtocolDialog.__updateOkButton" ID="HgUserConfigHostMinimumProtocolDialog.__updateOkButton"></a>
+<h4>HgUserConfigHostMinimumProtocolDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+<p>
+        Private method to update the status of the Ok button.
+</p><a NAME="HgUserConfigHostMinimumProtocolDialog.getData" ID="HgUserConfigHostMinimumProtocolDialog.getData"></a>
+<h4>HgUserConfigHostMinimumProtocolDialog.getData</h4>
+<b>getData</b>(<i></i>)
+<p>
+        Public method to retrieve the data.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+tuple containig the host name and the minimum protocol
+</dd>
+</dl><dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of two str
+</dd>
+</dl><a NAME="HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged" ID="HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged"></a>
+<h4>HgUserConfigHostMinimumProtocolDialog.on_hostEdit_textChanged</h4>
+<b>on_hostEdit_textChanged</b>(<i>txt</i>)
+<p>
+        Private slot to handle changes of the host edit.
+</p><dl>
+<dt><i>txt</i> (str)</dt>
+<dd>
+current text
+</dd>
+</dl><a NAME="HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged" ID="HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged"></a>
+<h4>HgUserConfigHostMinimumProtocolDialog.on_minimumProtocolComboBox_currentIndexChanged</h4>
+<b>on_minimumProtocolComboBox_currentIndexChanged</b>(<i>index</i>)
+<p>
+        Private slot to handle the selection of a minimum protocol.
+</p><dl>
+<dt><i>index</i> (int)</dt>
+<dd>
+index of the selected entry
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.PurgeExtension.purge.html	Fri Apr 07 18:33:59 2017 +0200
@@ -89,17 +89,17 @@
 </dd>
 </dl><a NAME="Purge.__getEntries" ID="Purge.__getEntries"></a>
 <h4>Purge.__getEntries</h4>
-<b>__getEntries</b>(<i>repodir, all</i>)
+<b>__getEntries</b>(<i>repodir, deleteAll</i>)
 <p>
         Private method to get a list of files/directories being purged.
 </p><dl>
 <dt><i>repodir</i></dt>
 <dd>
 directory name of the repository (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to delete all files including ignored ones
-            (boolean)
+flag indicating to delete all files including ignored
+            ones (boolean)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -108,31 +108,31 @@
 </dd>
 </dl><a NAME="Purge.hgPurge" ID="Purge.hgPurge"></a>
 <h4>Purge.hgPurge</h4>
-<b>hgPurge</b>(<i>name, all=False</i>)
+<b>hgPurge</b>(<i>name, deleteAll=False</i>)
 <p>
         Public method to purge files and directories not tracked by Mercurial.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 file/directory name (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to delete all files including ignored ones
-            (boolean)
+flag indicating to delete all files including ignored
+            ones (boolean)
 </dd>
 </dl><a NAME="Purge.hgPurgeList" ID="Purge.hgPurgeList"></a>
 <h4>Purge.hgPurgeList</h4>
-<b>hgPurgeList</b>(<i>name, all=False</i>)
+<b>hgPurgeList</b>(<i>name, deleteAll=False</i>)
 <p>
         Public method to list files and directories not tracked by Mercurial.
 </p><dl>
 <dt><i>name</i></dt>
 <dd>
 file/directory name (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>deleteAll</i></dt>
 <dd>
-flag indicating to list all files including ignored ones
-            (boolean)
+flag indicating to list all files including ignored
+            ones (boolean)
 </dd>
 </dl><a NAME="Purge.shutdown" ID="Purge.shutdown"></a>
 <h4>Purge.shutdown</h4>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.ProjectHelper.html	Fri Apr 07 18:33:59 2017 +0200
@@ -395,7 +395,7 @@
         one is at the top on top of local changes.
 </p><a NAME="QueuesProjectHelper.__hgQueuePushPopPatches" ID="QueuesProjectHelper.__hgQueuePushPopPatches"></a>
 <h4>QueuesProjectHelper.__hgQueuePushPopPatches</h4>
-<b>__hgQueuePushPopPatches</b>(<i>name, operation, all=False, named=False, force=False</i>)
+<b>__hgQueuePushPopPatches</b>(<i>name, operation, doAll=False, named=False, force=False</i>)
 <p>
         Private method to push patches onto the stack or pop patches off the
         stack.
@@ -407,7 +407,7 @@
 <dd>
 operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-</dd><dt><i>all=</i></dt>
+</dd><dt><i>doAll=</i></dt>
 <dd>
 flag indicating to push/pop all (boolean)
 </dd><dt><i>named=</i></dt>
--- a/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.QueuesExtension.queues.html	Fri Apr 07 18:33:59 2017 +0200
@@ -215,14 +215,14 @@
 </dd>
 </dl><a NAME="Queues.getGuardsList" ID="Queues.getGuardsList"></a>
 <h4>Queues.getGuardsList</h4>
-<b>getGuardsList</b>(<i>repodir, all=True</i>)
+<b>getGuardsList</b>(<i>repodir, allGuards=True</i>)
 <p>
         Public method to get a list of all guards defined.
 </p><dl>
 <dt><i>repodir</i></dt>
 <dd>
 directory name of the repository (string)
-</dd><dt><i>all</i></dt>
+</dd><dt><i>allGuards</i></dt>
 <dd>
 flag indicating to get all guards (boolean)
 </dd>
@@ -406,7 +406,7 @@
 </dd>
 </dl><a NAME="Queues.hgQueuePushPopPatches" ID="Queues.hgQueuePushPopPatches"></a>
 <h4>Queues.hgQueuePushPopPatches</h4>
-<b>hgQueuePushPopPatches</b>(<i>name, operation, all=False, named=False, force=False</i>)
+<b>hgQueuePushPopPatches</b>(<i>name, operation, doAll=False, named=False, force=False</i>)
 <p>
         Public method to push patches onto the stack or pop patches off the
         stack.
@@ -418,7 +418,7 @@
 <dd>
 operation type to be performed (Queues.POP,
             Queues.PUSH, Queues.GOTO)
-</dd><dt><i>all=</i></dt>
+</dd><dt><i>doAll=</i></dt>
 <dd>
 flag indicating to push/pop all (boolean)
 </dd><dt><i>named=</i></dt>
--- a/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html	Fri Apr 07 18:33:59 2017 +0200
@@ -375,7 +375,7 @@
 </dd>
 </dl><a NAME="Listspace._addView" ID="Listspace._addView"></a>
 <h4>Listspace._addView</h4>
-<b>_addView</b>(<i>win, fn=None, noName="", next=False</i>)
+<b>_addView</b>(<i>win, fn=None, noName="", addNext=False</i>)
 <p>
         Protected method to add a view (i.e. window).
 </p><dl>
@@ -388,7 +388,7 @@
 </dd><dt><i>noName</i></dt>
 <dd>
 name to be used for an unnamed editor (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the view next to the current
             view (bool)
--- a/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.ViewManagerPlugins.Tabview.Tabview.html	Fri Apr 07 18:33:59 2017 +0200
@@ -533,13 +533,13 @@
 </dd>
 </dl><a NAME="TabWidget.indexOf" ID="TabWidget.indexOf"></a>
 <h4>TabWidget.indexOf</h4>
-<b>indexOf</b>(<i>object</i>)
+<b>indexOf</b>(<i>widget</i>)
 <p>
         Public method to get the tab index of the given editor.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>widget</i></dt>
 <dd>
-object to get the index for (QLabel or Editor)
+widget to get the index for (QLabel or Editor)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -580,13 +580,13 @@
 </dd>
 </dl><a NAME="TabWidget.removeWidget" ID="TabWidget.removeWidget"></a>
 <h4>TabWidget.removeWidget</h4>
-<b>removeWidget</b>(<i>object</i>)
+<b>removeWidget</b>(<i>widget</i>)
 <p>
         Public method to remove a widget.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>widget</i></dt>
 <dd>
-object to be removed (QWidget)
+widget to be removed (QWidget)
 </dd>
 </dl><a NAME="TabWidget.setCurrentWidget" ID="TabWidget.setCurrentWidget"></a>
 <h4>TabWidget.setCurrentWidget</h4>
@@ -814,7 +814,7 @@
 </dd>
 </dl><a NAME="Tabview._addView" ID="Tabview._addView"></a>
 <h4>Tabview._addView</h4>
-<b>_addView</b>(<i>win, fn=None, noName="", next=False</i>)
+<b>_addView</b>(<i>win, fn=None, noName="", addNext=False</i>)
 <p>
         Protected method to add a view (i.e. window).
 </p><dl>
@@ -827,7 +827,7 @@
 </dd><dt><i>noName</i></dt>
 <dd>
 name to be used for an unnamed editor (string)
-</dd><dt><i>next</i></dt>
+</dd><dt><i>addNext</i></dt>
 <dd>
 flag indicating to add the view next to the current
             view (bool)
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -132,12 +132,12 @@
         Private slot to enable/disable certain groups and the test button.
 </p><a NAME="FileDialogWizardDialog.__toggleInitialFilterAndResult" ID="FileDialogWizardDialog.__toggleInitialFilterAndResult"></a>
 <h4>FileDialogWizardDialog.__toggleInitialFilterAndResult</h4>
-<b>__toggleInitialFilterAndResult</b>(<i>id</i>)
+<b>__toggleInitialFilterAndResult</b>(<i>checkedId</i>)
 <p>
         Private slot to enable/disable the initial filter elements and the
         results entries.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>checkedId</i></dt>
 <dd>
 id of the clicked button (integer)
 </dd>
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.QRegExpWizard.QRegExpWizardCharactersDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -121,17 +121,17 @@
         Private slot to add a line of entry widgets for single characters.
 </p><a NAME="QRegExpWizardCharactersDialog.__formatCharacter" ID="QRegExpWizardCharactersDialog.__formatCharacter"></a>
 <h4>QRegExpWizardCharactersDialog.__formatCharacter</h4>
-<b>__formatCharacter</b>(<i>char, format</i>)
+<b>__formatCharacter</b>(<i>char, formatIdentifier</i>)
 <p>
         Private method to format the characters entered into the dialog.
 </p><dl>
 <dt><i>char</i></dt>
 <dd>
 character string entered into the dialog (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-string giving a special format (-c, -h, -i or -o) or
-            the already formatted character (string)
+string giving a special format (-c, -h, -i or
+            -o) or the already formatted character (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -145,11 +145,11 @@
         Private method to initialize the W3C character selector entries.
 </p><a NAME="QRegExpWizardCharactersDialog.__performSelectedAction" ID="QRegExpWizardCharactersDialog.__performSelectedAction"></a>
 <h4>QRegExpWizardCharactersDialog.__performSelectedAction</h4>
-<b>__performSelectedAction</b>(<i>format, lineedit, combo</i>)
+<b>__performSelectedAction</b>(<i>formatIdentifier, lineedit, combo</i>)
 <p>
         Private method performing some actions depending on the input.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>formatIdentifier</i></dt>
 <dd>
 format of the selected entry (string)
 </dd><dt><i>lineedit</i></dt>
@@ -174,16 +174,17 @@
 </dd>
 </dl><a NAME="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo" ID="QRegExpWizardCharactersDialog.__populateW3cCharacterCombo"></a>
 <h4>QRegExpWizardCharactersDialog.__populateW3cCharacterCombo</h4>
-<b>__populateW3cCharacterCombo</b>(<i>combo, format</i>)
+<b>__populateW3cCharacterCombo</b>(<i>combo, formatIdentifier</i>)
 <p>
         Private method to populate a W3C character selection combo.
 </p><dl>
 <dt><i>combo</i></dt>
 <dd>
 combo box to be populated (QComboBox)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-format identifier (one of "-ccp", "-ccn", "-cbp", "-cbn")
+format identifier (one of "-ccp", "-ccn",
+            "-cbp", "-cbn")
 </dd>
 </dl><a NAME="QRegExpWizardCharactersDialog.__rangesCharTypeSelected" ID="QRegExpWizardCharactersDialog.__rangesCharTypeSelected"></a>
 <h4>QRegExpWizardCharactersDialog.__rangesCharTypeSelected</h4>
--- a/Documentation/Source/eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardCharactersDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -117,17 +117,17 @@
         Private slot to add a line of entry widgets for single characters.
 </p><a NAME="QRegularExpressionWizardCharactersDialog.__formatCharacter" ID="QRegularExpressionWizardCharactersDialog.__formatCharacter"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__formatCharacter</h4>
-<b>__formatCharacter</b>(<i>char, format</i>)
+<b>__formatCharacter</b>(<i>char, formatIdentifier</i>)
 <p>
         Private method to format the characters entered into the dialog.
 </p><dl>
 <dt><i>char</i></dt>
 <dd>
 character string entered into the dialog (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
-string giving a special format (-c, -h, -i or -o) or
-            the already formatted character (string)
+string giving a special format (-c, -h, -i or
+            -o) or the already formatted character (string)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
@@ -141,11 +141,11 @@
         Private method to initialize the W3C character selector entries.
 </p><a NAME="QRegularExpressionWizardCharactersDialog.__performSelectedAction" ID="QRegularExpressionWizardCharactersDialog.__performSelectedAction"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__performSelectedAction</h4>
-<b>__performSelectedAction</b>(<i>format, lineedit, combo</i>)
+<b>__performSelectedAction</b>(<i>formatIdentifier, lineedit, combo</i>)
 <p>
         Private method performing some actions depending on the input.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>formatIdentifier</i></dt>
 <dd>
 format of the selected entry (string)
 </dd><dt><i>lineedit</i></dt>
@@ -170,14 +170,14 @@
 </dd>
 </dl><a NAME="QRegularExpressionWizardCharactersDialog.__populateCharacterCombo" ID="QRegularExpressionWizardCharactersDialog.__populateCharacterCombo"></a>
 <h4>QRegularExpressionWizardCharactersDialog.__populateCharacterCombo</h4>
-<b>__populateCharacterCombo</b>(<i>combo, format</i>)
+<b>__populateCharacterCombo</b>(<i>combo, formatIdentifier</i>)
 <p>
         Private method to populate a character selection combo.
 </p><dl>
 <dt><i>combo</i></dt>
 <dd>
 combo box to be populated (QComboBox)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>formatIdentifier</i></dt>
 <dd>
 format identifier (one of "-ccp", "-ccn",
             "-cbp", "-cbn", "-csp", "-csn", "-psp", "-psn")
--- a/Documentation/Source/eric6.Preferences.ConfigurationDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -107,7 +107,7 @@
 </table>
 <a NAME="ConfigurationDialog.__init__" ID="ConfigurationDialog.__init__"></a>
 <h4>ConfigurationDialog (Constructor)</h4>
-<b>ConfigurationDialog</b>(<i>parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=[], webEngine=False</i>)
+<b>ConfigurationDialog</b>(<i>parent=None, name=None, modal=False, fromEric=True, displayMode=ConfigurationWidget.DefaultMode, expandedEntries=None, webEngine=False</i>)
 <p>
         Constructor
 </p><dl>
@@ -368,7 +368,7 @@
 </table>
 <a NAME="ConfigurationWidget.__init__" ID="ConfigurationWidget.__init__"></a>
 <h4>ConfigurationWidget (Constructor)</h4>
-<b>ConfigurationWidget</b>(<i>parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=[], webEngine=False</i>)
+<b>ConfigurationWidget</b>(<i>parent=None, fromEric=True, displayMode=DefaultMode, expandedEntries=None, webEngine=False</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.ConfigurationPageBase.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.ConfigurationPageBase.html	Fri Apr 07 18:33:59 2017 +0200
@@ -141,7 +141,7 @@
         Public method to save the current state of the widget.
 </p><a NAME="ConfigurationPageBase.selectFont" ID="ConfigurationPageBase.selectFont"></a>
 <h4>ConfigurationPageBase.selectFont</h4>
-<b>selectFont</b>(<i>fontSample, fontVar, showFontInfo=False, options=QFontDialog.FontDialogOptions(0)</i>)
+<b>selectFont</b>(<i>fontSample, fontVar, showFontInfo=False, options=None</i>)
 <p>
         Public method used by the font selection buttons.
 </p><dl>
--- a/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorFilePage.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Preferences.ConfigurationPages.EditorFilePage.html	Fri Apr 07 18:33:59 2017 +0200
@@ -102,11 +102,11 @@
         Constructor
 </p><a NAME="EditorFilePage.__checkFileFilter" ID="EditorFilePage.__checkFileFilter"></a>
 <h4>EditorFilePage.__checkFileFilter</h4>
-<b>__checkFileFilter</b>(<i>filter</i>)
+<b>__checkFileFilter</b>(<i>fileFilter</i>)
 <p>
         Private method to check a file filter for validity.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileFilter</i></dt>
 <dd>
 file filter pattern to check (string)
 </dd>
--- a/Documentation/Source/eric6.Project.AddDirectoryDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.AddDirectoryDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -76,14 +76,14 @@
 </table>
 <a NAME="AddDirectoryDialog.__init__" ID="AddDirectoryDialog.__init__"></a>
 <h4>AddDirectoryDialog (Constructor)</h4>
-<b>AddDirectoryDialog</b>(<i>pro, filter='source', parent=None, name=None, startdir=None</i>)
+<b>AddDirectoryDialog</b>(<i>pro, fileTypeFilter='source', parent=None, name=None, startdir=None</i>)
 <p>
         Constructor
 </p><dl>
 <dt><i>pro</i></dt>
 <dd>
 reference to the project object
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>fileTypeFilter</i></dt>
 <dd>
 file type filter (string)
 </dd><dt><i>parent</i></dt>
@@ -120,7 +120,7 @@
 </dd>
 </dl><a NAME="AddDirectoryDialog.on_sourceDirPicker_textChanged" ID="AddDirectoryDialog.on_sourceDirPicker_textChanged"></a>
 <h4>AddDirectoryDialog.on_sourceDirPicker_textChanged</h4>
-<b>on_sourceDirPicker_textChanged</b>(<i>dir</i>)
+<b>on_sourceDirPicker_textChanged</b>(<i>directory</i>)
 <p>
         Private slot to handle the source directory text changed.
 </p><p>
@@ -129,7 +129,7 @@
         It is assumed, that the user wants to add a bunch of files to
         the project in place.
 </p><dl>
-<dt><i>dir</i></dt>
+<dt><i>directory</i></dt>
 <dd>
 the text of the source directory line edit (string)
 </dd>
--- a/Documentation/Source/eric6.Project.AddFileDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.AddFileDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -76,7 +76,7 @@
 </table>
 <a NAME="AddFileDialog.__init__" ID="AddFileDialog.__init__"></a>
 <h4>AddFileDialog (Constructor)</h4>
-<b>AddFileDialog</b>(<i>pro, parent=None, filter=None, name=None, startdir=None</i>)
+<b>AddFileDialog</b>(<i>pro, parent=None, fileTypeFilter=None, name=None, startdir=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -86,7 +86,7 @@
 </dd><dt><i>parent</i></dt>
 <dd>
 parent widget of this dialog (QWidget)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>fileTypeFilter</i></dt>
 <dd>
 filter specification for the file to add (string)
 </dd><dt><i>name</i></dt>
--- a/Documentation/Source/eric6.Project.Project.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.Project.html	Fri Apr 07 18:33:59 2017 +0200
@@ -1237,11 +1237,11 @@
         Private method to write the project data to an XML file.
 </p><a NAME="Project.addDirectory" ID="Project.addDirectory"></a>
 <h4>Project.addDirectory</h4>
-<b>addDirectory</b>(<i>filter=None, startdir=None</i>)
+<b>addDirectory</b>(<i>fileTypeFilter=None, startdir=None</i>)
 <p>
         Public method used to add all files of a directory to the project.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileTypeFilter</i></dt>
 <dd>
 filter to be used by the add directory dialog
             (string out of source, form, resource, interface, others)
@@ -1261,11 +1261,11 @@
 </dd>
 </dl><a NAME="Project.addFiles" ID="Project.addFiles"></a>
 <h4>Project.addFiles</h4>
-<b>addFiles</b>(<i>filter=None, startdir=None</i>)
+<b>addFiles</b>(<i>fileTypeFilter=None, startdir=None</i>)
 <p>
         Public slot used to add files to the project.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileTypeFilter</i></dt>
 <dd>
 filter to be used by the add file dialog
             (string out of source, form, resource, interface, others)
--- a/Documentation/Source/eric6.Project.ProjectBaseBrowser.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.ProjectBaseBrowser.html	Fri Apr 07 18:33:59 2017 +0200
@@ -385,7 +385,7 @@
         Protected method to rename a file of the project.
 </p><a NAME="ProjectBaseBrowser._selectEntries" ID="ProjectBaseBrowser._selectEntries"></a>
 <h4>ProjectBaseBrowser._selectEntries</h4>
-<b>_selectEntries</b>(<i>local=True, filter=None</i>)
+<b>_selectEntries</b>(<i>local=True, filterList=None</i>)
 <p>
         Protected method to select entries based on their VCS status.
 </p><dl>
@@ -393,7 +393,7 @@
 <dd>
 flag indicating local (i.e. non VCS controlled)
             file/directory entries should be selected (boolean)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
--- a/Documentation/Source/eric6.Project.ProjectBrowserModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.ProjectBrowserModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -431,7 +431,7 @@
 </dd>
 </dl><a NAME="ProjectBrowserModel.addNewItem" ID="ProjectBrowserModel.addNewItem"></a>
 <h4>ProjectBrowserModel.addNewItem</h4>
-<b>addNewItem</b>(<i>typeString, name, additionalTypeStrings=[]</i>)
+<b>addNewItem</b>(<i>typeString, name, additionalTypeStrings=None</i>)
 <p>
         Public method to add a new item to the model.
 </p><dl>
--- a/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Project.ProjectTranslationsBrowser.html	Fri Apr 07 18:33:59 2017 +0200
@@ -411,7 +411,7 @@
         Private slot called by the multiMenu aboutToShow signal.
 </p><a NAME="ProjectTranslationsBrowser.__writeTempProjectFile" ID="ProjectTranslationsBrowser.__writeTempProjectFile"></a>
 <h4>ProjectTranslationsBrowser.__writeTempProjectFile</h4>
-<b>__writeTempProjectFile</b>(<i>langs, filter</i>)
+<b>__writeTempProjectFile</b>(<i>langs, filterList</i>)
 <p>
         Private method to write a temporary project file suitable for
         pylupdate and lrelease.
@@ -421,10 +421,10 @@
 list of languages to include in the process. An empty
             list (default) means that all translations should be included.
             (list of ProjectBrowserFileItem)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
-list of source file extension that should be considered
-            (list of strings)
+list of source file extension that should be
+            considered (list of strings)
 </dd>
 </dl><dl>
 <dt>Returns:</dt>
--- a/Documentation/Source/eric6.PyUnit.UnittestDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.PyUnit.UnittestDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -486,7 +486,7 @@
 </dd>
 </dl><a NAME="UnittestDialog.testErrored" ID="UnittestDialog.testErrored"></a>
 <h4>UnittestDialog.testErrored</h4>
-<b>testErrored</b>(<i>test, exc, id</i>)
+<b>testErrored</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test errors.
 </p><dl>
@@ -496,13 +496,13 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="UnittestDialog.testFailed" ID="UnittestDialog.testFailed"></a>
 <h4>UnittestDialog.testFailed</h4>
-<b>testFailed</b>(<i>test, exc, id</i>)
+<b>testFailed</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test fails.
 </p><dl>
@@ -512,13 +512,13 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
 </dl><a NAME="UnittestDialog.testFailedExpected" ID="UnittestDialog.testFailedExpected"></a>
 <h4>UnittestDialog.testFailedExpected</h4>
-<b>testFailedExpected</b>(<i>test, exc, id</i>)
+<b>testFailedExpected</b>(<i>test, exc, testId</i>)
 <p>
         Public method called if a test fails expectedly.
 </p><dl>
@@ -528,7 +528,7 @@
 </dd><dt><i>exc</i></dt>
 <dd>
 string representation of the exception (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -541,7 +541,7 @@
         <b>Note</b>: It is also called if it has already failed or errored.
 </p><a NAME="UnittestDialog.testSkipped" ID="UnittestDialog.testSkipped"></a>
 <h4>UnittestDialog.testSkipped</h4>
-<b>testSkipped</b>(<i>test, reason, id</i>)
+<b>testSkipped</b>(<i>test, reason, testId</i>)
 <p>
         Public method called if a test was skipped.
 </p><dl>
@@ -551,7 +551,7 @@
 </dd><dt><i>reason</i></dt>
 <dd>
 reason for skipping the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
@@ -570,14 +570,14 @@
 </dd>
 </dl><a NAME="UnittestDialog.testSucceededUnexpected" ID="UnittestDialog.testSucceededUnexpected"></a>
 <h4>UnittestDialog.testSucceededUnexpected</h4>
-<b>testSucceededUnexpected</b>(<i>test, id</i>)
+<b>testSucceededUnexpected</b>(<i>test, testId</i>)
 <p>
         Public method called if a test succeeds unexpectedly.
 </p><dl>
 <dt><i>test</i></dt>
 <dd>
 name of the test (string)
-</dd><dt><i>id</i></dt>
+</dd><dt><i>testId</i></dt>
 <dd>
 id of the test (string)
 </dd>
--- a/Documentation/Source/eric6.QScintilla.Editor.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Editor.html	Fri Apr 07 18:33:59 2017 +0200
@@ -1496,13 +1496,13 @@
         menu action.
 </p><a NAME="Editor.__completionListSelected" ID="Editor.__completionListSelected"></a>
 <h4>Editor.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><dl>
-<dt><i>id</i></dt>
-<dd>
-the ID of the user list (should be 1) (integer)
+<dt><i>listId</i></dt>
+<dd>
+the ID of the user list (should be 1 or 2) (integer)
 </dd><dt><i>txt</i></dt>
 <dd>
 the selected text (string)
--- a/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.EditorButtonsWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -124,11 +124,11 @@
 </dd>
 </dl><a NAME="EditorButtonsWidget.__addButton" ID="EditorButtonsWidget.__addButton"></a>
 <h4>EditorButtonsWidget.__addButton</h4>
-<b>__addButton</b>(<i>format, iconName, toolTip</i>)
+<b>__addButton</b>(<i>formatName, iconName, toolTip</i>)
 <p>
         Private method to add a format button.
 </p><dl>
-<dt><i>format</i> (str)</dt>
+<dt><i>formatName</i> (str)</dt>
 <dd>
 unique name of the format
 </dd><dt><i>iconName</i> (str)</dt>
@@ -175,11 +175,11 @@
         Private method to set the enabled state of the scroll buttons.
 </p><a NAME="EditorButtonsWidget.__formatClicked" ID="EditorButtonsWidget.__formatClicked"></a>
 <h4>EditorButtonsWidget.__formatClicked</h4>
-<b>__formatClicked</b>(<i>format</i>)
+<b>__formatClicked</b>(<i>formatName</i>)
 <p>
         Private slot to handle a format button being clicked.
 </p><dl>
-<dt><i>format</i> (str)</dt>
+<dt><i>formatName</i> (str)</dt>
 <dd>
 format type of the button
 </dd>
--- a/Documentation/Source/eric6.QScintilla.Exporters.ExporterBase.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Exporters.ExporterBase.html	Fri Apr 07 18:33:59 2017 +0200
@@ -86,11 +86,11 @@
 </dd>
 </dl><a NAME="ExporterBase._getFileName" ID="ExporterBase._getFileName"></a>
 <h4>ExporterBase._getFileName</h4>
-<b>_getFileName</b>(<i>filter</i>)
+<b>_getFileName</b>(<i>fileFilter</i>)
 <p>
         Protected method to get the file name of the export file from the user.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>fileFilter</i></dt>
 <dd>
 the filter string to be used (string). The filter for
             "All Files (*)" is appended by this method.
--- a/Documentation/Source/eric6.QScintilla.Exporters.__init__.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Exporters.__init__.html	Fri Apr 07 18:33:59 2017 +0200
@@ -44,11 +44,11 @@
 <hr /><hr />
 <a NAME="getExporter" ID="getExporter"></a>
 <h2>getExporter</h2>
-<b>getExporter</b>(<i>format, editor</i>)
+<b>getExporter</b>(<i>exporterFormat, editor</i>)
 <p>
     Module function to instantiate an exporter object for a given format.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>exporterFormat</i></dt>
 <dd>
 format of the exporter (string)
 </dd><dt><i>editor</i></dt>
--- a/Documentation/Source/eric6.QScintilla.Lexers.__init__.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Lexers.__init__.html	Fri Apr 07 18:33:59 2017 +0200
@@ -237,7 +237,7 @@
 <hr /><hr />
 <a NAME="registerLexer" ID="registerLexer"></a>
 <h2>registerLexer</h2>
-<b>registerLexer</b>(<i>name, displayString, filenameSample, getLexerFunc, openFilters=[], saveFilters=[], defaultAssocs=[], iconFileName=""</i>)
+<b>registerLexer</b>(<i>name, displayString, filenameSample, getLexerFunc, openFilters=None, saveFilters=None, defaultAssocs=None, iconFileName=""</i>)
 <p>
     Module function to register a custom QScintilla lexer.
 </p><dl>
--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Fri Apr 07 18:33:59 2017 +0200
@@ -408,7 +408,7 @@
 </dd>
 </dl><a NAME="QsciScintillaCompat.__completionListSelected" ID="QsciScintillaCompat.__completionListSelected"></a>
 <h4>QsciScintillaCompat.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><p>
@@ -417,7 +417,7 @@
         list but not giving it back when an item is selected via a
         double-click.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 the ID of the user list (integer)
 </dd><dt><i>txt</i></dt>
@@ -1632,11 +1632,11 @@
 </dd>
 </dl><a NAME="QsciScintillaCompat.showUserList" ID="QsciScintillaCompat.showUserList"></a>
 <h4>QsciScintillaCompat.showUserList</h4>
-<b>showUserList</b>(<i>id, lst</i>)
+<b>showUserList</b>(<i>listId, lst</i>)
 <p>
             Public method to show a user supplied list.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 id of the list (integer)
 </dd><dt><i>lst</i></dt>
--- a/Documentation/Source/eric6.QScintilla.Shell.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.QScintilla.Shell.html	Fri Apr 07 18:33:59 2017 +0200
@@ -667,11 +667,11 @@
 </dd>
 </dl><a NAME="Shell.__completionListSelected" ID="Shell.__completionListSelected"></a>
 <h4>Shell.__completionListSelected</h4>
-<b>__completionListSelected</b>(<i>id, txt</i>)
+<b>__completionListSelected</b>(<i>listId, txt</i>)
 <p>
         Private slot to handle the selection from the completion list.
 </p><dl>
-<dt><i>id</i></dt>
+<dt><i>listId</i></dt>
 <dd>
 the ID of the user list (should be 1) (integer)
 </dd><dt><i>txt</i></dt>
@@ -1099,14 +1099,14 @@
 </dd>
 </dl><a NAME="Shell.focusNextPrevChild" ID="Shell.focusNextPrevChild"></a>
 <h4>Shell.focusNextPrevChild</h4>
-<b>focusNextPrevChild</b>(<i>next</i>)
+<b>focusNextPrevChild</b>(<i>nextChild</i>)
 <p>
         Public method to stop Tab moving to the next window.
 </p><p>
         While the user is entering a multi-line command, the movement to
         the next window by the Tab key being pressed is suppressed.
 </p><dl>
-<dt><i>next</i></dt>
+<dt><i>nextChild</i></dt>
 <dd>
 next window
 </dd>
--- a/Documentation/Source/eric6.Snapshot.SnapshotFreehandGrabber.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Snapshot.SnapshotFreehandGrabber.html	Fri Apr 07 18:33:59 2017 +0200
@@ -178,7 +178,7 @@
 <hr /><hr />
 <a NAME="drawPolygon" ID="drawPolygon"></a>
 <h2>drawPolygon</h2>
-<b>drawPolygon</b>(<i>painter, polygon, outline, fill=QColor()</i>)
+<b>drawPolygon</b>(<i>painter, polygon, outline, fill=None</i>)
 <p>
     Module function to draw a polygon with the given parameters.
 </p><dl>
--- a/Documentation/Source/eric6.Snapshot.SnapshotRegionGrabber.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Snapshot.SnapshotRegionGrabber.html	Fri Apr 07 18:33:59 2017 +0200
@@ -264,7 +264,7 @@
 <hr /><hr />
 <a NAME="drawRect" ID="drawRect"></a>
 <h2>drawRect</h2>
-<b>drawRect</b>(<i>painter, rect, outline, fill=QColor()</i>)
+<b>drawRect</b>(<i>painter, rect, outline, fill=None</i>)
 <p>
     Module function to draw a rectangle with the given parameters.
 </p><dl>
--- a/Documentation/Source/eric6.SqlBrowser.SqlBrowser.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.SqlBrowser.SqlBrowser.html	Fri Apr 07 18:33:59 2017 +0200
@@ -85,7 +85,7 @@
 </table>
 <a NAME="SqlBrowser.__init__" ID="SqlBrowser.__init__"></a>
 <h4>SqlBrowser (Constructor)</h4>
-<b>SqlBrowser</b>(<i>connections=[], parent=None</i>)
+<b>SqlBrowser</b>(<i>connections=None, parent=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.Tasks.TaskFilter.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Tasks.TaskFilter.html	Fri Apr 07 18:33:59 2017 +0200
@@ -119,11 +119,11 @@
 </dd>
 </dl><a NAME="TaskFilter.setFileNameFilter" ID="TaskFilter.setFileNameFilter"></a>
 <h4>TaskFilter.setFileNameFilter</h4>
-<b>setFileNameFilter</b>(<i>filter</i>)
+<b>setFileNameFilter</b>(<i>filterStr</i>)
 <p>
         Public method to set the filename filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 a wildcard expression for the filename filter
             to set (string) or None
@@ -160,11 +160,11 @@
 </dd>
 </dl><a NAME="TaskFilter.setSummaryFilter" ID="TaskFilter.setSummaryFilter"></a>
 <h4>TaskFilter.setSummaryFilter</h4>
-<b>setSummaryFilter</b>(<i>filter</i>)
+<b>setSummaryFilter</b>(<i>filterStr</i>)
 <p>
         Public method to set the description filter.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterStr</i></dt>
 <dd>
 a regular expression for the description filter
             to set (string) or None
--- a/Documentation/Source/eric6.Tools.TRPreviewer.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Tools.TRPreviewer.html	Fri Apr 07 18:33:59 2017 +0200
@@ -121,7 +121,7 @@
 </table>
 <a NAME="TRPreviewer.__init__" ID="TRPreviewer.__init__"></a>
 <h4>TRPreviewer (Constructor)</h4>
-<b>TRPreviewer</b>(<i>filenames=[], parent=None, name=None</i>)
+<b>TRPreviewer</b>(<i>filenames=None, parent=None, name=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.UI.Browser.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.Browser.html	Fri Apr 07 18:33:59 2017 +0200
@@ -350,11 +350,11 @@
         Protected slot to prepare the goto submenu of the attribute menu.
 </p><a NAME="Browser.getSelectedItems" ID="Browser.getSelectedItems"></a>
 <h4>Browser.getSelectedItems</h4>
-<b>getSelectedItems</b>(<i>filter=None</i>)
+<b>getSelectedItems</b>(<i>filterList=None</i>)
 <p>
         Public method to get the selected items.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -365,11 +365,11 @@
 </dd>
 </dl><a NAME="Browser.getSelectedItemsCount" ID="Browser.getSelectedItemsCount"></a>
 <h4>Browser.getSelectedItemsCount</h4>
-<b>getSelectedItemsCount</b>(<i>filter=None</i>)
+<b>getSelectedItemsCount</b>(<i>filterList=None</i>)
 <p>
         Public method to get the count of items selected.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -380,11 +380,11 @@
 </dd>
 </dl><a NAME="Browser.getSelectedItemsCountCategorized" ID="Browser.getSelectedItemsCountCategorized"></a>
 <h4>Browser.getSelectedItemsCountCategorized</h4>
-<b>getSelectedItemsCountCategorized</b>(<i>filter=None</i>)
+<b>getSelectedItemsCountCategorized</b>(<i>filterList=None</i>)
 <p>
         Public method to get a categorized count of selected items.
 </p><dl>
-<dt><i>filter</i></dt>
+<dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
@@ -463,14 +463,14 @@
         Public slot to save the toplevel directories.
 </p><a NAME="Browser.wantedItem" ID="Browser.wantedItem"></a>
 <h4>Browser.wantedItem</h4>
-<b>wantedItem</b>(<i>itm, filter=None</i>)
+<b>wantedItem</b>(<i>itm, filterList=None</i>)
 <p>
         Public method to check type of an item.
 </p><dl>
 <dt><i>itm</i></dt>
 <dd>
 the item to check (BrowserItem)
-</dd><dt><i>filter</i></dt>
+</dd><dt><i>filterList</i></dt>
 <dd>
 list of classes to check against
 </dd>
--- a/Documentation/Source/eric6.UI.BrowserModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.BrowserModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -1783,7 +1783,7 @@
 </dd>
 </dl><a NAME="BrowserModel.addItem" ID="BrowserModel.addItem"></a>
 <h4>BrowserModel.addItem</h4>
-<b>addItem</b>(<i>itm, parent=QModelIndex()</i>)
+<b>addItem</b>(<i>itm, parent=None</i>)
 <p>
         Public slot to add an item.
 </p><dl>
@@ -1811,7 +1811,7 @@
         Public method to clear the model.
 </p><a NAME="BrowserModel.columnCount" ID="BrowserModel.columnCount"></a>
 <h4>BrowserModel.columnCount</h4>
-<b>columnCount</b>(<i>parent=QModelIndex()</i>)
+<b>columnCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of columns.
 </p><dl>
@@ -1869,7 +1869,7 @@
 </dd>
 </dl><a NAME="BrowserModel.hasChildren" ID="BrowserModel.hasChildren"></a>
 <h4>BrowserModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check for the presence of child items.
 </p><p>
@@ -1908,7 +1908,7 @@
 </dd>
 </dl><a NAME="BrowserModel.index" ID="BrowserModel.index"></a>
 <h4>BrowserModel.index</h4>
-<b>index</b>(<i>row, column, parent=QModelIndex()</i>)
+<b>index</b>(<i>row, column, parent=None</i>)
 <p>
         Public method to create an index.
 </p><dl>
@@ -2083,7 +2083,7 @@
 </dd>
 </dl><a NAME="BrowserModel.rowCount" ID="BrowserModel.rowCount"></a>
 <h4>BrowserModel.rowCount</h4>
-<b>rowCount</b>(<i>parent=QModelIndex()</i>)
+<b>rowCount</b>(<i>parent=None</i>)
 <p>
         Public method to get the number of rows.
 </p><dl>
--- a/Documentation/Source/eric6.UI.BrowserSortFilterProxyModel.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.BrowserSortFilterProxyModel.html	Fri Apr 07 18:33:59 2017 +0200
@@ -117,7 +117,7 @@
 </dd>
 </dl><a NAME="BrowserSortFilterProxyModel.hasChildren" ID="BrowserSortFilterProxyModel.hasChildren"></a>
 <h4>BrowserSortFilterProxyModel.hasChildren</h4>
-<b>hasChildren</b>(<i>parent=QModelIndex()</i>)
+<b>hasChildren</b>(<i>parent=None</i>)
 <p>
         Public method to check for the presence of child items.
 </p><p>
--- a/Documentation/Source/eric6.UI.CompareDialog.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.CompareDialog.html	Fri Apr 07 18:33:59 2017 +0200
@@ -120,7 +120,7 @@
 </table>
 <a NAME="CompareDialog.__init__" ID="CompareDialog.__init__"></a>
 <h4>CompareDialog (Constructor)</h4>
-<b>CompareDialog</b>(<i>files=[], parent=None</i>)
+<b>CompareDialog</b>(<i>files=None, parent=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -134,7 +134,7 @@
 </dd>
 </dl><a NAME="CompareDialog.__appendText" ID="CompareDialog.__appendText"></a>
 <h4>CompareDialog.__appendText</h4>
-<b>__appendText</b>(<i>pane, linenumber, line, format, interLine=False</i>)
+<b>__appendText</b>(<i>pane, linenumber, line, charFormat, interLine=False</i>)
 <p>
         Private method to append text to the end of the contents pane.
 </p><dl>
@@ -147,7 +147,7 @@
 </dd><dt><i>line</i></dt>
 <dd>
 text to insert (string)
-</dd><dt><i>format</i></dt>
+</dd><dt><i>charFormat</i></dt>
 <dd>
 text format to be used (QTextCharFormat)
 </dd><dt><i>interLine</i></dt>
@@ -296,7 +296,7 @@
 </table>
 <a NAME="CompareWindow.__init__" ID="CompareWindow.__init__"></a>
 <h4>CompareWindow (Constructor)</h4>
-<b>CompareWindow</b>(<i>files=[], parent=None</i>)
+<b>CompareWindow</b>(<i>files=None, parent=None</i>)
 <p>
         Constructor
 </p><dl>
--- a/Documentation/Source/eric6.UI.NumbersWidget.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.NumbersWidget.html	Fri Apr 07 18:33:59 2017 +0200
@@ -378,11 +378,11 @@
 </dd>
 </dl><a NAME="NumbersWidget.__formatNumbers" ID="NumbersWidget.__formatNumbers"></a>
 <h4>NumbersWidget.__formatNumbers</h4>
-<b>__formatNumbers</b>(<i>format</i>)
+<b>__formatNumbers</b>(<i>numberFormat</i>)
 <p>
         Private method to format the various number inputs.
 </p><dl>
-<dt><i>format</i></dt>
+<dt><i>numberFormat</i></dt>
 <dd>
 number format indicator (integer)
 </dd>
--- a/Documentation/Source/eric6.UI.UserInterface.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.UI.UserInterface.html	Fri Apr 07 18:33:59 2017 +0200
@@ -1293,7 +1293,7 @@
 </dd>
 </dl><a NAME="UserInterface.__installPlugins" ID="UserInterface.__installPlugins"></a>
 <h4>UserInterface.__installPlugins</h4>
-<b>__installPlugins</b>(<i>pluginFileNames=[]</i>)
+<b>__installPlugins</b>(<i>pluginFileNames=None</i>)
 <p>
         Private slot to show a dialog to install a new plugin.
 </p><dl>
@@ -2067,16 +2067,16 @@
         Public slot to handle the activation of the cooperation window.
 </p><a NAME="UserInterface.addE5Actions" ID="UserInterface.addE5Actions"></a>
 <h4>UserInterface.addE5Actions</h4>
-<b>addE5Actions</b>(<i>actions, type</i>)
+<b>addE5Actions</b>(<i>actions, actionType</i>)
 <p>
         Public method to add actions to the list of actions.
 </p><dl>
 <dt><i>actions</i></dt>
 <dd>
 list of actions to be added (list of E5Action)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>actionType</i></dt>
 <dd>
-string denoting the action set to get.
+string denoting the action set to add to.
             It must be one of "ui" or "wizards".
 </dd>
 </dl><a NAME="UserInterface.addSideWidget" ID="UserInterface.addSideWidget"></a>
@@ -2211,11 +2211,11 @@
 </dd>
 </dl><a NAME="UserInterface.getActions" ID="UserInterface.getActions"></a>
 <h4>UserInterface.getActions</h4>
-<b>getActions</b>(<i>type</i>)
+<b>getActions</b>(<i>actionType</i>)
 <p>
         Public method to get a list of all actions.
 </p><dl>
-<dt><i>type</i></dt>
+<dt><i>actionType</i></dt>
 <dd>
 string denoting the action set to get.
             It must be one of "ui" or "wizards".
@@ -2437,16 +2437,16 @@
 </dd>
 </dl><a NAME="UserInterface.removeE5Actions" ID="UserInterface.removeE5Actions"></a>
 <h4>UserInterface.removeE5Actions</h4>
-<b>removeE5Actions</b>(<i>actions, type='ui'</i>)
+<b>removeE5Actions</b>(<i>actions, actionType='ui'</i>)
 <p>
         Public method to remove actions from the list of actions.
 </p><dl>
 <dt><i>actions</i></dt>
 <dd>
 list of actions (list of E5Action)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>actionType</i></dt>
 <dd>
-string denoting the action set to get.
+string denoting the action set to remove from.
             It must be one of "ui" or "wizards".
 </dd>
 </dl><a NAME="UserInterface.removeSideWidget" ID="UserInterface.removeSideWidget"></a>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.ClbrBaseClasses.html	Fri Apr 07 18:33:59 2017 +0200
@@ -150,7 +150,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -160,7 +160,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.__init__.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.__init__.html	Fri Apr 07 18:33:59 2017 +0200
@@ -88,7 +88,7 @@
 <hr /><hr />
 <a NAME="readmodule" ID="readmodule"></a>
 <h2>readmodule</h2>
-<b>readmodule</b>(<i>module, path=[], isPyFile=False</i>)
+<b>readmodule</b>(<i>module, path=None, isPyFile=False</i>)
 <p>
     Read a source file and return a dictionary of classes, functions, modules,
     etc. .
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.idlclbr.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.idlclbr.html	Fri Apr 07 18:33:59 2017 +0200
@@ -191,7 +191,7 @@
 </table>
 <a NAME="Interface.__init__" ID="Interface.__init__"></a>
 <h4>Interface (Constructor)</h4>
-<b>Interface</b>(<i>module, name, super, file, lineno</i>)
+<b>Interface</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -201,9 +201,10 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this interface
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
-list of interface names this interface is inherited from
+list of interface names this interface is
+            inherited from
 </dd><dt><i>file</i></dt>
 <dd>
 filename containing this interface
@@ -298,7 +299,7 @@
 <hr /><hr />
 <a NAME="readmodule_ex" ID="readmodule_ex"></a>
 <h2>readmodule_ex</h2>
-<b>readmodule_ex</b>(<i>module, path=[]</i>)
+<b>readmodule_ex</b>(<i>module, path=None</i>)
 <p>
     Read a CORBA IDL file and return a dictionary of classes, functions and
     modules.
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.jsclbr.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.jsclbr.html	Fri Apr 07 18:33:59 2017 +0200
@@ -334,7 +334,7 @@
 <hr /><hr />
 <a NAME="readmodule_ex" ID="readmodule_ex"></a>
 <h2>readmodule_ex</h2>
-<b>readmodule_ex</b>(<i>module, path=[]</i>)
+<b>readmodule_ex</b>(<i>module, path=None</i>)
 <p>
     Read a JavaScript file and return a dictionary of functions and variables.
 </p><dl>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.pyclbr.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.pyclbr.html	Fri Apr 07 18:33:59 2017 +0200
@@ -144,7 +144,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -154,7 +154,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
@@ -483,7 +483,7 @@
 <hr /><hr />
 <a NAME="readmodule_ex" ID="readmodule_ex"></a>
 <h2>readmodule_ex</h2>
-<b>readmodule_ex</b>(<i>module, path=[], inpackage=False, isPyFile=False</i>)
+<b>readmodule_ex</b>(<i>module, path=None, inpackage=False, isPyFile=False</i>)
 <p>
     Read a module file and return a dictionary of classes.
 </p><p>
--- a/Documentation/Source/eric6.Utilities.ClassBrowsers.rbclbr.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ClassBrowsers.rbclbr.html	Fri Apr 07 18:33:59 2017 +0200
@@ -135,7 +135,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -145,7 +145,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of this class
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of class names this class is inherited from
 </dd><dt><i>file</i></dt>
@@ -296,7 +296,7 @@
 <hr /><hr />
 <a NAME="readmodule_ex" ID="readmodule_ex"></a>
 <h2>readmodule_ex</h2>
-<b>readmodule_ex</b>(<i>module, path=[]</i>)
+<b>readmodule_ex</b>(<i>module, path=None</i>)
 <p>
     Read a Ruby file and return a dictionary of classes, functions and modules.
 </p><dl>
--- a/Documentation/Source/eric6.Utilities.ModuleParser.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.ModuleParser.html	Fri Apr 07 18:33:59 2017 +0200
@@ -195,7 +195,7 @@
 </table>
 <a NAME="Class.__init__" ID="Class.__init__"></a>
 <h4>Class (Constructor)</h4>
-<b>Class</b>(<i>module, name, super, file, lineno</i>)
+<b>Class</b>(<i>module, name, superClasses, file, lineno</i>)
 <p>
         Constructor
 </p><dl>
@@ -205,7 +205,7 @@
 </dd><dt><i>name</i></dt>
 <dd>
 name of the class (string)
-</dd><dt><i>super</i></dt>
+</dd><dt><i>superClasses</i></dt>
 <dd>
 list of classnames this class is inherited from
                 (list of strings)
@@ -467,7 +467,7 @@
 </table>
 <a NAME="Module.__init__" ID="Module.__init__"></a>
 <h4>Module (Constructor)</h4>
-<b>Module</b>(<i>name, file=None, type=None</i>)
+<b>Module</b>(<i>name, file=None, moduleType=None</i>)
 <p>
         Constructor
 </p><dl>
@@ -477,7 +477,7 @@
 </dd><dt><i>file</i></dt>
 <dd>
 filename of file containing this module (string)
-</dd><dt><i>type</i></dt>
+</dd><dt><i>moduleType</i></dt>
 <dd>
 type of this module
 </dd>
@@ -494,11 +494,11 @@
 </dd>
 </dl><a NAME="Module.__py_setVisibility" ID="Module.__py_setVisibility"></a>
 <h4>Module.__py_setVisibility</h4>
-<b>__py_setVisibility</b>(<i>object</i>)
+<b>__py_setVisibility</b>(<i>objectRef</i>)
 <p>
         Private method to set the visibility of an object.
 </p><dl>
-<dt><i>object</i></dt>
+<dt><i>objectRef</i></dt>
 <dd>
 reference to the object (Attribute, Class or Function)
 </dd>
@@ -899,7 +899,7 @@
 <hr /><hr />
 <a NAME="readModule" ID="readModule"></a>
 <h2>readModule</h2>
-<b>readModule</b>(<i>module, path=[], inpackage=False, basename="", extensions=None, caching=True</i>)
+<b>readModule</b>(<i>module, path=None, inpackage=False, basename="", extensions=None, caching=True</i>)
 <p>
     Function to read a module file and parse it.
 </p><p>
@@ -909,18 +909,18 @@
 </p><dl>
 <dt><i>module</i></dt>
 <dd>
-Name of the module to be parsed (string)
+name of the module to be parsed (string)
 </dd><dt><i>path</i></dt>
 <dd>
-Searchpath for the module (list of strings)
+search path for the module (list of strings)
 </dd><dt><i>inpackage</i></dt>
 <dd>
-Flag indicating that module is inside a
+flag indicating that module is inside a
         package (boolean)
 </dd><dt><i>basename</i></dt>
 <dd>
-a path basename. This basename is deleted from
-        the filename of the module file to be read. (string)
+a path basename that is deleted from the filename of
+        the module file to be read (string)
 </dd><dt><i>extensions</i></dt>
 <dd>
 list of extensions, which should be considered valid
--- a/Documentation/Source/eric6.Utilities.__init__.html	Thu Mar 23 18:58:56 2017 +0100
+++ b/Documentation/Source/eric6.Utilities.__init__.html	Fri Apr 07 18:33:59 2017 +0200
@@ -630,14 +630,14 @@
 <hr /><hr />
 <a NAME="escape_entities" ID="escape_entities"></a>
 <h2>escape_entities</h2>
-<b>escape_entities</b>(<i>m, map=_escape_map</i>)
+<b>escape_entities</b>(<i>m, escmap=_escape_map</i>)
 <p>
     Function to encode html entities.
 </p><dl>
 <dt><i>m</i></dt>
 <dd>
 the match object
-</dd><dt><i>map</i></dt>
+</dd><dt><i>escmap</i></dt>
 <dd>
 the map of entities to encode
 </dd>
@@ -727,6 +727,9 @@
 </dd><dt><i>endComment=</i></dt>
 <dd>
 string identifying the end of a comment (string)
+</dd><dt><i>flagsLine=</i></dt>
+<dd>