Sun, 28 May 2023 14:40:05 +0200
Merged with branch 'eric7' in order to prepare a new release.
--- a/src/eric7/HelpViewer/HelpViewerWidget.py Sat May 27 19:02:58 2023 +0200 +++ b/src/eric7/HelpViewer/HelpViewerWidget.py Sun May 28 14:40:05 2023 +0200 @@ -339,6 +339,8 @@ self.__centerSplitter.setSizes([900, 150]) + self.__helpInstaller = None + if Preferences.getHelp("QtHelpSearchNewOnStart"): QTimer.singleShot(50, self.__lookForNewDocumentation) @@ -494,7 +496,7 @@ self.__helpSearchEngine.cancelIndexing() self.__helpSearchEngine.cancelSearching() - self.__helpInstaller.stop() + self.__helpInstaller and self.__helpInstaller.stop() @pyqtSlot() def __openFile(self):
--- a/src/eric7/PluginManager/PluginInstallDialog.py Sat May 27 19:02:58 2023 +0200 +++ b/src/eric7/PluginManager/PluginInstallDialog.py Sun May 28 14:40:05 2023 +0200 @@ -340,7 +340,7 @@ insideHeader = False for line in pluginSource.splitlines(): line = line.strip() - if line.startswith("# Start-Of-Header"): + if line.lower().startswith("# start-of-header"): insideHeader = True continue @@ -351,7 +351,7 @@ # it is a new style header separator = ":" continue - elif line.startswith("# End-Of-Header"): + elif line.lower().startswith("# end-of-header"): break with contextlib.suppress(ValueError):
--- a/src/eric7/Utilities/BackgroundService.py Sat May 27 19:02:58 2023 +0200 +++ b/src/eric7/Utilities/BackgroundService.py Sun May 28 14:40:05 2023 +0200 @@ -526,10 +526,11 @@ self.close() for connection in self.connections.values(): - connection.readyRead.disconnect() - connection.disconnected.disconnect() - connection.close() - connection.deleteLater() + with contextlib.suppress(RuntimeError): + connection.readyRead.disconnect() + connection.disconnected.disconnect() + connection.close() + connection.deleteLater() for process, _interpreter in self.processes.values(): process.close()