diff -r ce599998be7d -r 46651e194fbe src/eric7/APIs/Python3/eric7.api --- a/src/eric7/APIs/Python3/eric7.api Thu Sep 26 09:48:49 2024 +0200 +++ b/src/eric7/APIs/Python3/eric7.api Thu Sep 26 15:49:36 2024 +0200 @@ -1108,6 +1108,14 @@ eric7.EricCore.EricFileSystemWatcher._EricFileSystemEventHandler?2(parent=None) eric7.EricCore.EricFileSystemWatcher._GlobalFileSystemWatcher?8 eric7.EricCore.EricFileSystemWatcher.instance?4() +eric7.EricCore.EricPreferences.EricPreferences.proxyDefaults?7 +eric7.EricCore.EricPreferences._settingsNameGlobal?8 +eric7.EricCore.EricPreferences._settingsNameOrganization?8 +eric7.EricCore.EricPreferences.convertPasswords?4(oldPassword, newPassword) +eric7.EricCore.EricPreferences.getNetworkProxy?4(key) +eric7.EricCore.EricPreferences.initPreferences?4() +eric7.EricCore.EricPreferences.setNetworkProxy?4(key, value) +eric7.EricCore.EricPreferences.syncPreferences?4() eric7.EricCore.EricProcess.EricProcess.failed?7 eric7.EricCore.EricProcess.EricProcess.succeeded?7 eric7.EricCore.EricProcess.EricProcess.timedOut?4() @@ -1242,12 +1250,12 @@ eric7.EricNetwork.EricJsonServer.EricJsonServer.startClient?4(interpreter, clientScript, clientArgs, idString="", environment=None) eric7.EricNetwork.EricJsonServer.EricJsonServer.stopAllClients?4() eric7.EricNetwork.EricJsonServer.EricJsonServer.stopClient?4(idString="") -eric7.EricNetwork.EricJsonServer.EricJsonServer?1(name="", multiplex=False, parent=None) +eric7.EricNetwork.EricJsonServer.EricJsonServer?1(name="", interface="127.0.0.1", multiplex=False, parent=None) eric7.EricNetwork.EricJsonStreamReader.EricJsonReader.address?4() eric7.EricNetwork.EricJsonStreamReader.EricJsonReader.dataReceived?7 eric7.EricNetwork.EricJsonStreamReader.EricJsonReader.handleNewConnection?4() eric7.EricNetwork.EricJsonStreamReader.EricJsonReader.port?4() -eric7.EricNetwork.EricJsonStreamReader.EricJsonReader?1(name="", ip=None, parent=None) +eric7.EricNetwork.EricJsonStreamReader.EricJsonReader?1(name="", interface="127.0.0.1", parent=None) eric7.EricNetwork.EricJsonStreamWriter.EricJsonWriter.close?4() eric7.EricNetwork.EricJsonStreamWriter.EricJsonWriter.write?4(data) eric7.EricNetwork.EricJsonStreamWriter.EricJsonWriter?1(host, port) @@ -1282,7 +1290,7 @@ eric7.EricNetwork.EricSslCertificatesDialog.EricSslCertificatesDialog.on_serversExportButton_clicked?4() eric7.EricNetwork.EricSslCertificatesDialog.EricSslCertificatesDialog.on_serversImportButton_clicked?4() eric7.EricNetwork.EricSslCertificatesDialog.EricSslCertificatesDialog.on_serversViewButton_clicked?4() -eric7.EricNetwork.EricSslCertificatesDialog.EricSslCertificatesDialog?1(parent=None) +eric7.EricNetwork.EricSslCertificatesDialog.EricSslCertificatesDialog?1(settings, parent=None) eric7.EricNetwork.EricSslCertificatesInfoDialog.EricSslCertificatesInfoDialog?1(certificateChain, parent=None) eric7.EricNetwork.EricSslCertificatesInfoWidget.EricSslCertificatesInfoWidget.on_chainComboBox_activated?4(index) eric7.EricNetwork.EricSslCertificatesInfoWidget.EricSslCertificatesInfoWidget.showCertificate?4(certificate) @@ -1292,7 +1300,7 @@ eric7.EricNetwork.EricSslErrorHandler.EricSslErrorHandler.sslErrors?4(errors, server, port=-1) eric7.EricNetwork.EricSslErrorHandler.EricSslErrorHandler.sslErrorsReply?4(reply, errors) eric7.EricNetwork.EricSslErrorHandler.EricSslErrorHandler.sslErrorsReplySlot?4(reply, errors) -eric7.EricNetwork.EricSslErrorHandler.EricSslErrorHandler?1(parent=None) +eric7.EricNetwork.EricSslErrorHandler.EricSslErrorHandler?1(settings, parent=None) eric7.EricNetwork.EricSslErrorHandler.EricSslErrorState.NOT_IGNORED?7 eric7.EricNetwork.EricSslErrorHandler.EricSslErrorState.SYSTEM_IGNORED?7 eric7.EricNetwork.EricSslErrorHandler.EricSslErrorState.USER_IGNORED?7 @@ -1366,13 +1374,64 @@ eric7.EricUtilities.EricCache.EricCache.setSize?4(newSize) eric7.EricUtilities.EricCache.EricCache?1(size=100) eric7.EricUtilities.EricMutexLocker.EricMutexLocker?1(mutex) +eric7.EricUtilities._configDir?8 +eric7.EricUtilities._escape?8 +eric7.EricUtilities._escape_map?8 +eric7.EricUtilities._uescape?8 +eric7.EricUtilities._uunescape?8 +eric7.EricUtilities.crypto.CryptoMarker?7 +eric7.EricUtilities.crypto.Delimiter?7 +eric7.EricUtilities.crypto.EncodeMarker?7 +eric7.EricUtilities.crypto.MainPassword?7 +eric7.EricUtilities.crypto.changeRememberedMain?4(newPassword) +eric7.EricUtilities.crypto.dataDecrypt?4(edata, password, keyLength=32) +eric7.EricUtilities.crypto.dataEncrypt?4(data, password, keyLength=32, hashIterations=10000) +eric7.EricUtilities.crypto.pwConvert?4(pw, encode=True) +eric7.EricUtilities.crypto.pwDecode?4(epw) +eric7.EricUtilities.crypto.pwDecrypt?4(epw, mainPW=None) +eric7.EricUtilities.crypto.pwEncode?4(pw) +eric7.EricUtilities.crypto.pwEncrypt?4(pw, mainPW=None) +eric7.EricUtilities.crypto.pwRecode?4(epw, oldPassword, newPassword) +eric7.EricUtilities.crypto.pwReencrypt?4(epw, oldPassword, newPassword) +eric7.EricUtilities.crypto.py3AES.AES.KeySize?7 +eric7.EricUtilities.crypto.py3AES.AES.Rcon?7 +eric7.EricUtilities.crypto.py3AES.AES.decrypt?4(iput, key, size) +eric7.EricUtilities.crypto.py3AES.AES.encrypt?4(iput, key, size) +eric7.EricUtilities.crypto.py3AES.AES.rsbox?7 +eric7.EricUtilities.crypto.py3AES.AES.sbox?7 +eric7.EricUtilities.crypto.py3AES.AESModeOfOperation.ModeOfOperation?7 +eric7.EricUtilities.crypto.py3AES.AESModeOfOperation.aes?7 +eric7.EricUtilities.crypto.py3AES.AESModeOfOperation.decrypt?4(cipherIn, originalsize, mode, key, size, IV) +eric7.EricUtilities.crypto.py3AES.AESModeOfOperation.encrypt?4(inputData, mode, key, size, IV) +eric7.EricUtilities.crypto.py3AES.append_PKCS7_padding?4(b) +eric7.EricUtilities.crypto.py3AES.decryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"]) +eric7.EricUtilities.crypto.py3AES.encryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"]) +eric7.EricUtilities.crypto.py3AES.strip_PKCS7_padding?4(b) +eric7.EricUtilities.crypto.py3PBKDF2.Delimiter?7 +eric7.EricUtilities.crypto.py3PBKDF2.Hashes?7 +eric7.EricUtilities.crypto.py3PBKDF2.hashPassword?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32) +eric7.EricUtilities.crypto.py3PBKDF2.hashPasswordTuple?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32) +eric7.EricUtilities.crypto.py3PBKDF2.pbkdf2?4(password, salt, iterations, digestMod) +eric7.EricUtilities.crypto.py3PBKDF2.rehashPassword?4(password, hashParameters) +eric7.EricUtilities.crypto.py3PBKDF2.verifyPassword?4(password, pwHash) eric7.EricUtilities.dataString?4(size, loc=None) +eric7.EricUtilities.decodeBytes?4(buffer) +eric7.EricUtilities.decodeString?4(text) +eric7.EricUtilities.escape_entities?4(m, escmap=_escape_map) +eric7.EricUtilities.escape_uentities?4(m) +eric7.EricUtilities.getConfigDir?4() +eric7.EricUtilities.html_encode?4(text, pattern=_escape) +eric7.EricUtilities.html_udecode?4(text, pattern=_uunescape) +eric7.EricUtilities.html_uencode?4(text, pattern=_uescape) +eric7.EricUtilities.readStringFromStream?4(stream) +eric7.EricUtilities.setConfigDir?4(d) eric7.EricUtilities.strGroup?4(txt, sep, groupLen=4) eric7.EricUtilities.strToQByteArray?4(txt) eric7.EricUtilities.toBool?4(value) eric7.EricUtilities.toByteArray?4(value) eric7.EricUtilities.toDict?4(value) eric7.EricUtilities.toList?4(value) +eric7.EricUtilities.unescape_uentities?4(m) eric7.EricUtilities.versionIsValid?4(version) eric7.EricUtilities.versionToTuple?4(version) eric7.EricWidgets.EricAnimatedLabel.EricAnimatedLabel.getAnimationFile?4() @@ -2084,8 +2143,6 @@ eric7.EricXML.XMLStreamReaderBase.XMLStreamReaderBase.showErrorMessage?4() eric7.EricXML.XMLStreamReaderBase.XMLStreamReaderBase.toBool?4(value) eric7.EricXML.XMLStreamReaderBase.XMLStreamReaderBase?1(device) -eric7.Globals.configDir?7 -eric7.Globals.getConfigDir?4() eric7.Globals.getInstallInfoFilePath?4() eric7.Globals.getWebBrowserSupport?4() eric7.Globals.recentNameBreakpointConditions?7 @@ -2101,7 +2158,6 @@ eric7.Globals.recentNameTestFileHistory?7 eric7.Globals.recentNameTestFramework?7 eric7.Globals.recentNameTestNameHistory?7 -eric7.Globals.setConfigDir?4(d) eric7.Globals.settingsNameGlobal?7 eric7.Globals.settingsNameOrganization?7 eric7.Globals.settingsNameRecent?7 @@ -7661,8 +7717,6 @@ eric7.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage.save?4() eric7.Preferences.ConfigurationPages.MultiProjectPage.MultiProjectPage?1() eric7.Preferences.ConfigurationPages.MultiProjectPage.create?4(_dlg) -eric7.Preferences.ConfigurationPages.NetworkPage.NetworkPage.on_clearProxyPasswordsButton_clicked?4() -eric7.Preferences.ConfigurationPages.NetworkPage.NetworkPage.on_ftpProxyTypeCombo_currentIndexChanged?4(index) eric7.Preferences.ConfigurationPages.NetworkPage.NetworkPage.save?4() eric7.Preferences.ConfigurationPages.NetworkPage.NetworkPage.setMode?4(displayMode) eric7.Preferences.ConfigurationPages.NetworkPage.NetworkPage?1(configDialog) @@ -11307,57 +11361,14 @@ eric7.Utilities.PasswordChecker.PasswordStrength.VeryStrong?7 eric7.Utilities.PasswordChecker.PasswordStrength.VeryWeak?7 eric7.Utilities.PasswordChecker.PasswordStrength.Weak?7 -eric7.Utilities._escape?8 -eric7.Utilities._escape_map?8 eric7.Utilities._percentReplacementFunc?5(matchobj) eric7.Utilities._slashmap?8 -eric7.Utilities._uescape?8 -eric7.Utilities._uunescape?8 eric7.Utilities.codingBytes_regexps?7 eric7.Utilities.coding_regexps?7 eric7.Utilities.convertLineEnds?4(text, eol) -eric7.Utilities.crypto.CryptoMarker?7 -eric7.Utilities.crypto.Delimiter?7 -eric7.Utilities.crypto.EncodeMarker?7 -eric7.Utilities.crypto.MainPassword?7 -eric7.Utilities.crypto.changeRememberedMain?4(newPassword) -eric7.Utilities.crypto.dataDecrypt?4(edata, password, keyLength=32) -eric7.Utilities.crypto.dataEncrypt?4(data, password, keyLength=32, hashIterations=10000) -eric7.Utilities.crypto.pwConvert?4(pw, encode=True) -eric7.Utilities.crypto.pwDecode?4(epw) -eric7.Utilities.crypto.pwDecrypt?4(epw, mainPW=None) -eric7.Utilities.crypto.pwEncode?4(pw) -eric7.Utilities.crypto.pwEncrypt?4(pw, mainPW=None) -eric7.Utilities.crypto.pwRecode?4(epw, oldPassword, newPassword) -eric7.Utilities.crypto.pwReencrypt?4(epw, oldPassword, newPassword) -eric7.Utilities.crypto.py3AES.AES.KeySize?7 -eric7.Utilities.crypto.py3AES.AES.Rcon?7 -eric7.Utilities.crypto.py3AES.AES.decrypt?4(iput, key, size) -eric7.Utilities.crypto.py3AES.AES.encrypt?4(iput, key, size) -eric7.Utilities.crypto.py3AES.AES.rsbox?7 -eric7.Utilities.crypto.py3AES.AES.sbox?7 -eric7.Utilities.crypto.py3AES.AESModeOfOperation.ModeOfOperation?7 -eric7.Utilities.crypto.py3AES.AESModeOfOperation.aes?7 -eric7.Utilities.crypto.py3AES.AESModeOfOperation.decrypt?4(cipherIn, originalsize, mode, key, size, IV) -eric7.Utilities.crypto.py3AES.AESModeOfOperation.encrypt?4(inputData, mode, key, size, IV) -eric7.Utilities.crypto.py3AES.append_PKCS7_padding?4(b) -eric7.Utilities.crypto.py3AES.decryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"]) -eric7.Utilities.crypto.py3AES.encryptData?4(key, data, mode=AESModeOfOperation.ModeOfOperation["CBC"]) -eric7.Utilities.crypto.py3AES.strip_PKCS7_padding?4(b) -eric7.Utilities.crypto.py3PBKDF2.Delimiter?7 -eric7.Utilities.crypto.py3PBKDF2.Hashes?7 -eric7.Utilities.crypto.py3PBKDF2.hashPassword?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32) -eric7.Utilities.crypto.py3PBKDF2.hashPasswordTuple?4(password, digestMod=hashlib.sha512, iterations=10000, saltSize=32) -eric7.Utilities.crypto.py3PBKDF2.pbkdf2?4(password, salt, iterations, digestMod) -eric7.Utilities.crypto.py3PBKDF2.rehashPassword?4(password, hashParameters) -eric7.Utilities.crypto.py3PBKDF2.verifyPassword?4(password, pwHash) eric7.Utilities.decode?4(text) -eric7.Utilities.decodeBytes?4(buffer) -eric7.Utilities.decodeString?4(text) eric7.Utilities.decodeWithEncoding?4(text, encoding) eric7.Utilities.encode?4(text, origEncoding, forcedEncoding="") -eric7.Utilities.escape_entities?4(m, escmap=_escape_map) -eric7.Utilities.escape_uentities?4(m) eric7.Utilities.extractFlags?4(text) eric7.Utilities.extractFlagsFromFile?4(filename) eric7.Utilities.extractLineFlags?4(line, startComment=") @@ -11375,21 +11386,16 @@ eric7.Utilities.getTestFileNames?4(fn) eric7.Utilities.get_coding?4(text) eric7.Utilities.get_codingBytes?4(text) -eric7.Utilities.html_encode?4(text, pattern=_escape) -eric7.Utilities.html_udecode?4(text, pattern=_uunescape) -eric7.Utilities.html_uencode?4(text, pattern=_uescape) eric7.Utilities.linesep?4() eric7.Utilities.normalizeCode?4(codestring) eric7.Utilities.parseOptionString?4(s) eric7.Utilities.readEncodedFile?4(filename) eric7.Utilities.readEncodedFileWithEncoding?4(filename, encoding) eric7.Utilities.readEncodedFileWithHash?4(filename) -eric7.Utilities.readStringFromStream?4(stream) eric7.Utilities.rxIndex?4(rx, txt) eric7.Utilities.slash?4(txt) eric7.Utilities.supportedCodecs?7 eric7.Utilities.uic.compileUiFiles?4(directory, recurse=False) -eric7.Utilities.unescape_uentities?4(m) eric7.Utilities.unslash?4(txt) eric7.Utilities.writeEncodedFile?4(filename, text, origEncoding, forcedEncoding="") eric7.VCS.CommandOptionsDialog.VcsCommandOptionsDialog.getOptions?4()