--- a/APIs/Python3/eric6.api Wed Nov 01 19:22:02 2017 +0100 +++ b/APIs/Python3/eric6.api Fri Nov 03 12:10:16 2017 +0100 @@ -439,13 +439,13 @@ 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.remoteCoverage?4(interpreter, 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.remoteLoad?4(interpreter, 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.remoteProfile?4(interpreter, 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="") +eric6.Debugger.DebugServer.DebugServer.remoteRun?4(interpreter, fn, argv, wd, env, autoClearShell=True, forProject=False, runInConsole=False, autoFork=False, forkChild=False, clientType="") eric6.Debugger.DebugServer.DebugServer.remoteSetThread?4(tid) eric6.Debugger.DebugServer.DebugServer.remoteStatement?4(stmt) eric6.Debugger.DebugServer.DebugServer.remoteStep?4() @@ -479,7 +479,7 @@ eric6.Debugger.DebugServer.DebugServer.signalClientVariable?4(scope, variables) eric6.Debugger.DebugServer.DebugServer.signalClientVariables?4(scope, variables) eric6.Debugger.DebugServer.DebugServer.signalClientWatchConditionError?4(condition) -eric6.Debugger.DebugServer.DebugServer.startClient?4(unplanned=True, clType=None, forProject=False, runInConsole=False) +eric6.Debugger.DebugServer.DebugServer.startClient?4(unplanned=True, clType=None, forProject=False, runInConsole=False, interpreter="") eric6.Debugger.DebugServer.DebugServer.unregisterDebuggerInterface?4(interfaceName) eric6.Debugger.DebugServer.DebugServer.utFinished?7 eric6.Debugger.DebugServer.DebugServer.utPrepared?7 @@ -511,6 +511,7 @@ eric6.Debugger.DebugUI.DebugUI.setExcIgnoreList?4(excIgnoreList) eric6.Debugger.DebugUI.DebugUI.setExcList?4(excList) eric6.Debugger.DebugUI.DebugUI.setExceptionReporting?4(exceptions) +eric6.Debugger.DebugUI.DebugUI.setInterpreterHistory?4(interpreterStr, clearHistories=False, history=None) eric6.Debugger.DebugUI.DebugUI.setTracePython?4(tracePython) eric6.Debugger.DebugUI.DebugUI.setWdHistory?4(wdStr, clearHistories=False, history=None) eric6.Debugger.DebugUI.DebugUI.shutdown?4() @@ -578,8 +579,8 @@ eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.remoteWatchpointIgnore?4(cond, count) eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.setCallTraceEnabled?4(on) eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.shutdown?4() -eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemote?4(port, runInConsole) -eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemoteForProject?4(port, runInConsole) +eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemote?4(port, runInConsole, interpreter) +eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone.startRemoteForProject?4(port, runInConsole, interpreter) eric6.Debugger.DebuggerInterfaceNone.DebuggerInterfaceNone?1(debugServer, passive) eric6.Debugger.DebuggerInterfaceNone.createDebuggerInterfaceNone?4(debugServer, passive) eric6.Debugger.DebuggerInterfaceNone.getRegistryData?4() @@ -620,8 +621,8 @@ eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.remoteWatchpointIgnore?4(cond, count) eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.setCallTraceEnabled?4(on) eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.shutdown?4() -eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemote?4(port, runInConsole) -eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemoteForProject?4(port, runInConsole) +eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemote?4(port, runInConsole, interpreter) +eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython.startRemoteForProject?4(port, runInConsole, interpreter) eric6.Debugger.DebuggerInterfacePython.DebuggerInterfacePython?1(debugServer, passive, pythonVariant) eric6.Debugger.DebuggerInterfacePython.createDebuggerInterfacePython2?4(debugServer, passive) eric6.Debugger.DebuggerInterfacePython.createDebuggerInterfacePython3?4(debugServer, passive) @@ -653,7 +654,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, dialogType=0, modfuncList=None, tracePython=False, autoClearShell=True, autoContinue=True, autoFork=False, forkChild=False) +eric6.Debugger.StartDialog.StartDialog?1(caption, interpreterList, 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() @@ -1250,7 +1251,7 @@ eric6.E5Gui.E5TableView.E5TableView.keyPressEvent?4(evt) eric6.E5Gui.E5TableView.E5TableView.removeAll?4() eric6.E5Gui.E5TableView.E5TableView.removeSelected?4() -eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.attachTextEdit?4(textedit) +eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.attachTextEdit?4(textedit, editType="QTextEdit") eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.keyPressEvent?4(event) eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findNextButton_clicked?4() eric6.E5Gui.E5TextEditSearchWidget.E5TextEditSearchWidget.on_findPrevButton_clicked?4() @@ -1537,6 +1538,18 @@ eric6.E5Network.isValidAddress?4(address) eric6.E5Network.isValidIPv4Address?4(address) eric6.E5Network.isValidIPv6Address?4(address) +eric6.E5Utilities.E5Cache.E5Cache.add?4(key, item) +eric6.E5Utilities.E5Cache.E5Cache.clear?4() +eric6.E5Utilities.E5Cache.E5Cache.get?4(key) +eric6.E5Utilities.E5Cache.E5Cache.getMaximumCacheTime?4() +eric6.E5Utilities.E5Cache.E5Cache.getSize?4() +eric6.E5Utilities.E5Cache.E5Cache.info?4() +eric6.E5Utilities.E5Cache.E5Cache.length?4() +eric6.E5Utilities.E5Cache.E5Cache.remove?4(key) +eric6.E5Utilities.E5Cache.E5Cache.reset?4() +eric6.E5Utilities.E5Cache.E5Cache.setMaximumCacheTime?4(time) +eric6.E5Utilities.E5Cache.E5Cache.setSize?4(newSize) +eric6.E5Utilities.E5Cache.E5Cache?1(size=100) eric6.E5XML.Config.debuggerPropertiesFileFormatVersion?7 eric6.E5XML.Config.dictionariesListFileFormatVersion?7 eric6.E5XML.Config.highlightingStylesFileFormatVersion?7 @@ -3546,7 +3559,8 @@ eric6.MultiProject.AddProjectDialog.AddProjectDialog.on_nameEdit_textChanged?4(txt) eric6.MultiProject.AddProjectDialog.AddProjectDialog?1(parent=None, startdir=None, project=None, categories=None) eric6.MultiProject.MultiProject.MultiProject.addE5Actions?4(actions) -eric6.MultiProject.MultiProject.MultiProject.addProject?4(startdir=None) +eric6.MultiProject.MultiProject.MultiProject.addNewProject?4(startdir=None) +eric6.MultiProject.MultiProject.MultiProject.addProject?4(project) eric6.MultiProject.MultiProject.MultiProject.changeProjectProperties?4(pro) eric6.MultiProject.MultiProject.MultiProject.checkDirty?4() eric6.MultiProject.MultiProject.MultiProject.clearRecent?4() @@ -3560,7 +3574,7 @@ eric6.MultiProject.MultiProject.MultiProject.getMostRecent?4() eric6.MultiProject.MultiProject.MultiProject.getMultiProjectFile?4() eric6.MultiProject.MultiProject.MultiProject.getMultiProjectPath?4() -eric6.MultiProject.MultiProject.MultiProject.getProject?4(fn) +eric6.MultiProject.MultiProject.MultiProject.getProject?4(uid) eric6.MultiProject.MultiProject.MultiProject.getProjects?4() eric6.MultiProject.MultiProject.MultiProject.initActions?4() eric6.MultiProject.MultiProject.MultiProject.initMenu?4() @@ -3578,12 +3592,14 @@ eric6.MultiProject.MultiProject.MultiProject.projectOpened?7 eric6.MultiProject.MultiProject.MultiProject.projectRemoved?7 eric6.MultiProject.MultiProject.MultiProject.removeE5Actions?4(actions) -eric6.MultiProject.MultiProject.MultiProject.removeProject?4(fn) +eric6.MultiProject.MultiProject.MultiProject.removeProject?4(uid) eric6.MultiProject.MultiProject.MultiProject.saveMultiProject?4() eric6.MultiProject.MultiProject.MultiProject.saveMultiProjectAs?4() eric6.MultiProject.MultiProject.MultiProject.setDirty?4(b) eric6.MultiProject.MultiProject.MultiProject.showMenu?7 eric6.MultiProject.MultiProject.MultiProject?1(project, parent=None, filename=None) +eric6.MultiProject.MultiProjectBrowser.MultiProjectBrowser.ProjectFileNameRole?7 +eric6.MultiProject.MultiProjectBrowser.MultiProjectBrowser.ProjectUidRole?7 eric6.MultiProject.MultiProjectBrowser.MultiProjectBrowser?1(multiProject, project, parent=None) eric6.MultiProject.PropertiesDialog.PropertiesDialog.storeData?4() eric6.MultiProject.PropertiesDialog.PropertiesDialog?1(multiProject, new=True, parent=None) @@ -6295,6 +6311,9 @@ eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage.save?4() eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.EditorCalltipsQScintillaPage?1() eric6.Preferences.ConfigurationPages.EditorCalltipsQScintillaPage.create?4(dlg) +eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage.save?4() +eric6.Preferences.ConfigurationPages.EditorDocViewerPage.EditorDocViewerPage?1(parent=None) +eric6.Preferences.ConfigurationPages.EditorDocViewerPage.create?4(dlg) eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_exportersCombo_activated?4(exporter) eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.on_rtfFontButton_clicked?4() eric6.Preferences.ConfigurationPages.EditorExportersPage.EditorExportersPage.save?4() @@ -6576,6 +6595,7 @@ eric6.Preferences.Prefs.corbaDefaults?7 eric6.Preferences.Prefs.debuggerDefaults?7 eric6.Preferences.Prefs.diffColourDefaults?7 +eric6.Preferences.Prefs.docuViewerDefaults?7 eric6.Preferences.Prefs.editorColourDefaults?7 eric6.Preferences.Prefs.editorDefaults?7 eric6.Preferences.Prefs.editorExporterDefaults?7 @@ -6672,6 +6692,7 @@ eric6.Preferences.getCorba?4(key, prefClass=Prefs) eric6.Preferences.getDebugger?4(key, prefClass=Prefs) eric6.Preferences.getDiffColour?4(key, prefClass=Prefs) +eric6.Preferences.getDocuViewer?4(key, prefClass=Prefs) eric6.Preferences.getEditor?4(key, prefClass=Prefs) eric6.Preferences.getEditorAPI?4(language, projectType="", prefClass=Prefs) eric6.Preferences.getEditorColour?4(key, prefClass=Prefs) @@ -6726,6 +6747,7 @@ eric6.Preferences.setCorba?4(key, value, prefClass=Prefs) eric6.Preferences.setDebugger?4(key, value, prefClass=Prefs) eric6.Preferences.setDiffColour?4(key, value, prefClass=Prefs) +eric6.Preferences.setDocuViewer?4(key, value, prefClass=Prefs) eric6.Preferences.setEditor?4(key, value, prefClass=Prefs) eric6.Preferences.setEditorAPI?4(language, projectType, apilist, prefClass=Prefs) eric6.Preferences.setEditorColour?4(key, value, prefClass=Prefs) @@ -6966,7 +6988,7 @@ eric6.Project.Project.Project.saveProject?4() eric6.Project.Project.Project.saveProjectAs?4() eric6.Project.Project.Project.setData?4(category, key, data) -eric6.Project.Project.Project.setDbgInfo?4(argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None) +eric6.Project.Project.Project.setDbgInfo?4(interpreter, argv, wd, env, excReporting, excList, excIgnoreList, autoClearShell, tracePython=None, autoContinue=None) eric6.Project.Project.Project.setDirty?4(b) eric6.Project.Project.Project.setStatusMonitorAutoUpdate?4(auto) eric6.Project.Project.Project.setStatusMonitorInterval?4(interval) @@ -7236,9 +7258,11 @@ eric6.QScintilla.Editor.Editor.EndEditToken?7 eric6.QScintilla.Editor.Editor.EnumID?7 eric6.QScintilla.Editor.Editor.FromDocumentID?7 +eric6.QScintilla.Editor.Editor.KeywordsID?7 eric6.QScintilla.Editor.Editor.MethodID?7 eric6.QScintilla.Editor.Editor.MethodPrivateID?7 eric6.QScintilla.Editor.Editor.MethodProtectedID?7 +eric6.QScintilla.Editor.Editor.ModuleID?7 eric6.QScintilla.Editor.Editor.RequestSyncToken?7 eric6.QScintilla.Editor.Editor.Separator?7 eric6.QScintilla.Editor.Editor.StartEditToken?7 @@ -7248,7 +7272,7 @@ eric6.QScintilla.Editor.Editor.WarningStyle?7 eric6.QScintilla.Editor.Editor.addCallTipHook?4(key, func) eric6.QScintilla.Editor.Editor.addClone?4(editor) -eric6.QScintilla.Editor.Editor.addCompletionListHook?4(key, func) +eric6.QScintilla.Editor.Editor.addCompletionListHook?4(key, func, async=False) eric6.QScintilla.Editor.Editor.addedToProject?4() eric6.QScintilla.Editor.Editor.autoComplete?4(auto=False, context=True) eric6.QScintilla.Editor.Editor.autoCompleteQScintilla?4() @@ -7283,6 +7307,7 @@ eric6.QScintilla.Editor.Editor.commentLine?4() eric6.QScintilla.Editor.Editor.commentLineOrSelection?4() eric6.QScintilla.Editor.Editor.commentSelection?4() +eric6.QScintilla.Editor.Editor.completionsListReady?4(completions, acText) eric6.QScintilla.Editor.Editor.contextMenuEvent?4(evt) eric6.QScintilla.Editor.Editor.coverageMarkersShown?7 eric6.QScintilla.Editor.Editor.curLineHasBreakpoint?4() @@ -8652,6 +8677,29 @@ eric6.UI.BrowserSortFilterProxyModel.BrowserSortFilterProxyModel?1(parent=None) eric6.UI.ClearPrivateDataDialog.ClearPrivateDataDialog.getData?4() eric6.UI.ClearPrivateDataDialog.ClearPrivateDataDialog?1(parent=None) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.documentationReady?4(documentationInfo, isWarning=False, isDocWarning=False) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.finalizeSetup?4() +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.getProviders?4() +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.isSupportedLanguage?4(language) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.on_providerComboBox_currentIndexChanged?4(index) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.preferencesChanged?4() +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.providerAdded?7 +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.providerRemoved?7 +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.registerProvider?4(providerName, providerDisplay, provider, supported) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.showInfo?4(editor) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.shutdown?4() +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer.unregisterProvider?4(providerName) +eric6.UI.CodeDocumentationViewer.CodeDocumentationViewer?1(parent=None) +eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.clear?4() +eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.preferencesChanged?4() +eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer.setText?4(text) +eric6.UI.CodeDocumentationViewer.PlainTextDocumentationViewer?1(parent=None) +eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.clear?4() +eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer.setHtml?4(html) +eric6.UI.CodeDocumentationViewer.WebViewDocumentationViewer?1(parent=None) +eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocWarningDocument?4(text) +eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlDocument?4(documentationInfo) +eric6.UI.CodeDocumentationViewerTemplate.prepareDocumentationViewerHtmlWarningDocument?4(text) eric6.UI.CompareDialog.CompareDialog.compare?4(lines1, lines2, name1="", name2="") eric6.UI.CompareDialog.CompareDialog.on_buttonBox_clicked?4(button) eric6.UI.CompareDialog.CompareDialog.on_diffButton_clicked?4() @@ -8857,6 +8905,7 @@ eric6.UI.UserInterface.UserInterface.ErrorLogFileName?7 eric6.UI.UserInterface.UserInterface.LeftSide?7 eric6.UI.UserInterface.UserInterface.RightSide?7 +eric6.UI.UserInterface.UserInterface.activateCodeDocumentationViewer?4(switchFocus=True) eric6.UI.UserInterface.UserInterface.activateCooperationViewer?4() eric6.UI.UserInterface.UserInterface.addE5Actions?4(actions, actionType) eric6.UI.UserInterface.UserInterface.addSideWidget?4(side, widget, icon, label) @@ -8871,6 +8920,7 @@ eric6.UI.UserInterface.UserInterface.checkProjectsWorkspace?4() eric6.UI.UserInterface.UserInterface.closeEvent?4(event) eric6.UI.UserInterface.UserInterface.createPopupMenu?4() +eric6.UI.UserInterface.UserInterface.documentationViewer?4() eric6.UI.UserInterface.UserInterface.dragEnterEvent?4(event) eric6.UI.UserInterface.UserInterface.dragLeaveEvent?4(event) eric6.UI.UserInterface.UserInterface.dragMoveEvent?4(event) @@ -9490,6 +9540,7 @@ eric6.ViewManager.ViewManager.ViewManager.insertNumber?4(txt) eric6.ViewManager.ViewManager.ViewManager.insertSymbol?4(txt) eric6.ViewManager.ViewManager.ViewManager.isConnected?4() +eric6.ViewManager.ViewManager.ViewManager.isEditorInfoSupported?4(language) eric6.ViewManager.ViewManager.ViewManager.lastEditorClosed?7 eric6.ViewManager.ViewManager.ViewManager.mainWidget?4() eric6.ViewManager.ViewManager.ViewManager.newEditor?4() @@ -9531,6 +9582,7 @@ eric6.ViewManager.ViewManager.ViewManager.shareConnected?4(connected) eric6.ViewManager.ViewManager.ViewManager.shareEditor?4(share) eric6.ViewManager.ViewManager.ViewManager.showDebugSource?4(fn, line) +eric6.ViewManager.ViewManager.ViewManager.showEditorInfo?4(editor) eric6.ViewManager.ViewManager.ViewManager.showReplaceWidget?4() eric6.ViewManager.ViewManager.ViewManager.showSearchWidget?4() eric6.ViewManager.ViewManager.ViewManager.showWindowMenu?4(windowMenu)