Mercurial Repositories > eric / changeset

--- a/docs/changelog	Tue Jan 04 15:38:11 2022 +0100
+++ b/docs/changelog	Tue Feb 08 14:15:48 2022 +0100
@@ -1,5 +1,30 @@
 Change Log
 ----------
+Version 22.2:
+- bug fixes
+- General
+  -- dropped support for Python 3.6 because that is end-of-life
+- File Browser
+  -- added capability to open SVG files in the text editor
+- Help Viewer
+  -- added bookmarks to the internal help viewer
+- MicroPython
+  -- updated the list of known CircuitPython boards
+  -- updated the list of known UF2 capable boards
+  -- added support for ESP32-C3, ESP32-S2 and ESP32-S3 chips
+  -- added a dialog to show information for a connected board
+- Project Browser
+  -- added capability to open SVG files in the text editor to the Project
+     Others Browser
+- Styles and Themes
+  -- added a dark blueish style (QSS and Highlighters) and an associated theme
+     (dark_blue.ethj and dark_blue_with_stylesheet.ethj)
+- Third Party packages
+  -- upgraded coverage to 6.2.0
+
+Version 22.1.1:
+- bug fix
+
 Version 22.1:
 - bug fixes
 - Code Style Checker
@@ -10,7 +35,7 @@
   -- added configuration capability
 - QSS Previewer
   -- added disabled widgets in order to show their colors as well
-- Styles and Themes:
+- Styles and Themes
   -- added a dark greenish style (QSS and Highlighters) and an associated theme
      (dark_green.ethj and dark_green_with_stylesheet.ethj)
 

--- a/eric7.epj	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7.epj	Tue Feb 08 14:15:48 2022 +0100
@@ -1,7 +1,7 @@
 {
   "header": {
     "comment": "eric project file for project eric7",
-    "copyright": "Copyright (C) 2021 Detlev Offenbach, detlev@die-offenbachs.de"
+    "copyright": "Copyright (C) 2022 Detlev Offenbach, detlev@die-offenbachs.de"
   },
   "project": {
     "AUTHOR": "Detlev Offenbach",
@@ -715,7 +715,10 @@
       "eric7/UI/FindLocationWidget.ui",
       "eric7/JediInterface/RefactoringPreviewDialog.ui",
       "eric7/QScintilla/EditorOutlineSizesDialog.ui",
-      "eric7/Preferences/ConfigurationPages/InterfaceLightPage.ui"
+      "eric7/Preferences/ConfigurationPages/InterfaceLightPage.ui",
+      "eric7/HelpViewer/HelpBookmarkPropertiesDialog.ui",
+      "eric7/HelpViewer/HelpBookmarksImportDialog.ui",
+      "eric7/MicroPython/BoardDataDialog.ui"
     ],
     "HASH": "df7daa8781250f7664e6ecaeaf1361fa2efd39ee",
     "IDLPARAMS": {
@@ -2305,7 +2308,11 @@
       "eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportsEnums.py",
       "eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportNode.py",
       "eric7/Preferences/ThemeManager.py",
-      "eric7/Preferences/ConfigurationPages/InterfaceLightPage.py"
+      "eric7/Preferences/ConfigurationPages/InterfaceLightPage.py",
+      "eric7/HelpViewer/HelpBookmarksWidget.py",
+      "eric7/HelpViewer/HelpBookmarkPropertiesDialog.py",
+      "eric7/HelpViewer/HelpBookmarksImportDialog.py",
+      "eric7/MicroPython/BoardDataDialog.py"
     ],
     "SPELLEXCLUDES": "Dictionaries/excludes.dic",
     "SPELLLANGUAGE": "en_US",

--- a/eric7/APIs/Python3/eric7.api	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/APIs/Python3/eric7.api	Tue Feb 08 14:15:48 2022 +0100
@@ -2083,6 +2083,17 @@
 eric7.Graphics.UMLItem.UMLModel?1(name)
 eric7.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog.getData?4()
 eric7.Graphics.UMLSceneSizeDialog.UMLSceneSizeDialog?1(w, h, minW, minH, parent=None, name=None)
+eric7.HelpViewer.HelpBookmarkPropertiesDialog.HelpBookmarkPropertiesDialog.getData?4()
+eric7.HelpViewer.HelpBookmarkPropertiesDialog.HelpBookmarkPropertiesDialog?1(title="", url="", parent=None)
+eric7.HelpViewer.HelpBookmarksImportDialog.HelpBookmarksImportDialog.getData?4()
+eric7.HelpViewer.HelpBookmarksImportDialog.HelpBookmarksImportDialog?1(parent=None)
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.UrlRole?7
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.addBookmark?4(title, url)
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.escapePressed?7
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.newBackgroundTab?7
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.newTab?7
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget.openUrl?7
+eric7.HelpViewer.HelpBookmarksWidget.HelpBookmarksWidget?1(parent=None)
 eric7.HelpViewer.HelpViewerImpl.HelpViewerImpl.gotoHistory?4(index)
 eric7.HelpViewer.HelpViewerImpl.HelpViewerImpl.isBackwardAvailable?4()
 eric7.HelpViewer.HelpViewerImpl.HelpViewerImpl.isEmptyPage?4()
@@ -2161,6 +2172,7 @@
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.MaxHistoryItems?7
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.activate?4(searchWord=None, url=None)
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.addPage?4(url=None, background=False)
+eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.bookmarkPage?4(title, url)
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.closeAllPages?4()
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.closeCurrentPage?4()
 eric7.HelpViewer.HelpViewerWidget.HelpViewerWidget.closeOtherPages?4()
@@ -2181,7 +2193,7 @@
 eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.closeAllPages?4()
 eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.closeCurrentPage?4()
 eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.closeOtherPages?4()
-eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.currentChanged?7
+eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.currentPageChanged?7
 eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget.insertPage?4(index, viewer, background=False)
 eric7.HelpViewer.OpenPagesWidget.OpenPagesWidget?1(stack, parent=None)
 eric7.HexEdit.HexEditChunks.HexEditChunk?1()
@@ -2451,6 +2463,7 @@
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog.on_deviceTypeComboBox_currentIndexChanged?4(index)
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog.on_reportButton_clicked?4()
 eric7.MicroPython.AddEditDevicesDialog.AddEditDevicesDialog?1(vid=0, pid=0, description=0, deviceData=None, parent=None)
+eric7.MicroPython.BoardDataDialog.BoardDataDialog?1(data, parent=None)
 eric7.MicroPython.CircuitPythonDevices.CircuitPythonDevice.DeviceVolumeName?7
 eric7.MicroPython.CircuitPythonDevices.CircuitPythonDevice.addDeviceMenuEntries?4(menu)
 eric7.MicroPython.CircuitPythonDevices.CircuitPythonDevice.canRunScript?4()
@@ -2473,6 +2486,7 @@
 eric7.MicroPython.ConnectionSelectionDialog.ConnectionSelectionDialog.on_deviceTypeComboBox_currentTextChanged?4(txt)
 eric7.MicroPython.ConnectionSelectionDialog.ConnectionSelectionDialog.on_portNameComboBox_currentTextChanged?4(txt)
 eric7.MicroPython.ConnectionSelectionDialog.ConnectionSelectionDialog?1(ports, currentPort, currentType, parent=None)
+eric7.MicroPython.EspBackupRestoreFirmwareDialog.EspBackupRestoreFirmwareDialog.Chips?7
 eric7.MicroPython.EspBackupRestoreFirmwareDialog.EspBackupRestoreFirmwareDialog.FlashModes?7
 eric7.MicroPython.EspBackupRestoreFirmwareDialog.EspBackupRestoreFirmwareDialog.FlashSizes?7
 eric7.MicroPython.EspBackupRestoreFirmwareDialog.EspBackupRestoreFirmwareDialog.getData?4()
@@ -2492,6 +2506,8 @@
 eric7.MicroPython.EspDevices.EspDevice.runScript?4(script)
 eric7.MicroPython.EspDevices.EspDevice.setButtons?4()
 eric7.MicroPython.EspDevices.EspDevice?1(microPythonWidget, deviceType, parent=None)
+eric7.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.Chips?7
+eric7.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.FlashAddresses?7
 eric7.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.FlashModes?7
 eric7.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.getData?4()
 eric7.MicroPython.EspFirmwareSelectionDialog.EspFirmwareSelectionDialog.on_espComboBox_currentTextChanged?4(chip)
@@ -2518,6 +2534,7 @@
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.executeAsyncFinished?7
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.fileSystemInfo?4()
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.get?4(deviceFileName, hostFileName=None)
+eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.getBoardInformation?4()
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.getImplementation?4()
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.getTime?4()
 eric7.MicroPython.MicroPythonCommandsInterface.MicroPythonCommandsInterface.handlePreferencesChanged?4()
@@ -7721,6 +7738,7 @@
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._contextMenuRequested?5(coord)
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._createPopupMenus?5()
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._editPixmap?5()
+eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._openFileInEditor?5()
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._openHexEditor?5()
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._openItem?5()
 eric7.Project.ProjectOthersBrowser.ProjectOthersBrowser._showContextMenu?5(menu)
@@ -9309,6 +9327,7 @@
 eric7.UI.Browser.Browser._keyboardSearchType?5(item)
 eric7.UI.Browser.Browser._newDirectory?5()
 eric7.UI.Browser.Browser._newFile?5()
+eric7.UI.Browser.Browser._openFileInEditor?5()
 eric7.UI.Browser.Browser._openHexEditor?5()
 eric7.UI.Browser.Browser._openItem?5()
 eric7.UI.Browser.Browser._resizeColumns?5(index)

--- a/eric7/APIs/Python3/eric7.bas	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/APIs/Python3/eric7.bas	Tue Feb 08 14:15:48 2022 +0100
@@ -37,6 +37,7 @@
 AutoScroller QObject
 BackgroundService QTcpServer
 BinaryModel QAbstractTableModel
+BoardDataDialog QDialog Ui_BoardDataDialog
 BookmarkActionSelectionDialog QDialog Ui_BookmarkActionSelectionDialog
 BookmarkInfoDialog QDialog Ui_BookmarkInfoDialog
 BookmarkPropertiesDialog QDialog Ui_BookmarkPropertiesDialog
@@ -411,6 +412,9 @@
 GreaseMonkeyManager QObject
 GreaseMonkeyScript QObject
 GroupEnum enum.IntEnum
+HelpBookmarkPropertiesDialog QDialog Ui_HelpBookmarkPropertiesDialog
+HelpBookmarksImportDialog QDialog Ui_HelpBookmarksImportDialog
+HelpBookmarksWidget QListWidget
 HelpDocsInstaller QThread
 HelpDocumentationPage ConfigurationPageBase Ui_HelpDocumentationPage
 HelpIndexWidget QWidget
@@ -666,7 +670,7 @@
 NsHtmlReader QObject
 NsHtmlWriter QObject
 NumbersWidget QWidget Ui_NumbersWidget
-OpenPagesWidget QWidget
+OpenPagesWidget QListWidget
 OpenSearchDialog QDialog Ui_OpenSearchDialog
 OpenSearchEditDialog QDialog Ui_OpenSearchEditDialog
 OpenSearchEngine QObject

--- a/eric7/CondaInterface/CondaInfoDialog.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/CondaInterface/CondaInfoDialog.py	Tue Feb 08 14:15:48 2022 +0100
@@ -133,6 +133,3 @@
         if "offline" in infoDict:
             self.offlineCheckBox.setChecked(
                 infoDict["offline"])
-        
-        msh = self.minimumSizeHint()
-        self.resize(max(self.width(), msh.width()), msh.height())

--- a/eric7/DataViews/CodeMetricsDialog.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DataViews/CodeMetricsDialog.py	Tue Feb 08 14:15:48 2022 +0100
@@ -7,9 +7,10 @@
 Module implementing a code metrics dialog.
 """
 
-import os
+import collections
 import fnmatch
-import collections
+import os
+import time
 
 from PyQt6.QtCore import pyqtSlot, Qt, QLocale
 from PyQt6.QtWidgets import (
@@ -175,6 +176,7 @@
             self.resultList.setSortingEnabled(False)
             
             # now go through all the files
+            now = time.monotonic()
             for progress, file in enumerate(files, start=1):
                 if self.cancelled:
                     return
@@ -192,7 +194,9 @@
                 self.resultList.expandItem(fitm)
                 
                 self.checkProgress.setValue(progress)
-                QApplication.processEvents()
+                if time.monotonic() - now > 0.01:
+                    QApplication.processEvents()
+                    now = time.monotonic()
         finally:
             # reenable updates of the list
             self.resultList.setSortingEnabled(True)

--- a/eric7/DebugClients/Python/DebugBase.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/DebugBase.py	Tue Feb 08 14:15:48 2022 +0100
@@ -899,7 +899,6 @@
         self.skipFrames = 0
         if (exctype == RuntimeError and
                 str(excval).startswith('maximum recursion depth exceeded') or
-                sys.version_info >= (3, 5) and
                 exctype == RecursionError):  # __IGNORE_WARNING__
             excval = 'maximum recursion depth exceeded'
             depth = 0

--- a/eric7/DebugClients/Python/DebugUtilities.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/DebugUtilities.py	Tue Feb 08 14:15:48 2022 +0100
@@ -397,7 +397,7 @@
     @exception RuntimeError raised to indicate an illegal arguments parsing
         condition
     """
-    # see http:#msdn.microsoft.com/en-us/library/a1y7w461.aspx
+    # see http://msdn.microsoft.com/en-us/library/a1y7w461.aspx
     result = []
     
     DEFAULT = 0
@@ -409,10 +409,12 @@
     buf = ''
     
     argsLen = len(args)
-    for i in range(argsLen):
+    i = 0
+    while i < argsLen:
         ch = args[i]
         if ch == '\\':
             backslashes += 1
+            i += 1
             continue
         elif backslashes != 0:
             if ch == '"':
@@ -425,6 +427,7 @@
                     
                     buf += '"'
                     backslashes = 0
+                    i += 1
                     continue
             else:
                 # false alarm, treat passed backslashes literally...
@@ -438,11 +441,13 @@
         if ch in (' ', '\t'):
             if state == DEFAULT:
                 # skip
+                i += 1
                 continue
             elif state == ARG:
                 state = DEFAULT
                 result.append(buf)
                 buf = ''
+                i += 1
                 continue
         
         if state not in (DEFAULT, ARG, IN_DOUBLE_QUOTE):
@@ -470,6 +475,8 @@
             else:
                 state = ARG
                 buf += ch
+        
+        i += 1
     
     if len(buf) > 0 or state != DEFAULT:
         result.append(buf)

--- a/eric7/DebugClients/Python/ModuleLoader.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/ModuleLoader.py	Tue Feb 08 14:15:48 2022 +0100
@@ -28,7 +28,7 @@
         """
         self.__dbgClient = debugClient
         
-        self.__enableImportHooks = True
+        self.__enableImportHooks = set()
         
         # reset already imported thread module to apply hooks at next import
         for moduleName in ("thread", "_thread", "threading"):
@@ -59,7 +59,7 @@
         """
         module = importlib.import_module(fullname)
         sys.modules[fullname] = module
-        
+        self.__enableImportHooks.remove(fullname)
         ## Add hook for _thread.start_new_thread
         if (
             fullname == '_thread' and
@@ -110,7 +110,6 @@
             self.__dbgClient.patchQThread(module)
             patchQProcess(module, self.__dbgClient)
         
-        self.__enableImportHooks = True
         return module
     
     def find_spec(self, fullname, path, target=None):
@@ -127,15 +126,15 @@
         @return module spec object pointing to the module loader
         @rtype ModuleSpec
         """
-        if fullname in sys.modules or not self.__dbgClient.debugging:
+        if fullname in sys.modules or self.__dbgClient.debugging is False:
             return None
         
         if (
             fullname in self.__modulesToPatch and
-            self.__enableImportHooks
+            fullname not in self.__enableImportHooks
         ):
             # Disable hook to be able to import original module
-            self.__enableImportHooks = False
+            self.__enableImportHooks.add(fullname)
             return importlib.machinery.ModuleSpec(fullname, self)
         
         return None

--- a/eric7/DebugClients/Python/SubprocessExtension.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/SubprocessExtension.py	Tue Feb 08 14:15:48 2022 +0100
@@ -11,7 +11,10 @@
 import os
 import shlex
 
-from DebugUtilities import isPythonProgram, patchArguments
+from DebugUtilities import (
+    isPythonProgram, patchArguments, stringToArgumentsWindows,
+    isWindowsPlatform
+)
 
 _debugClient = None
 
@@ -49,7 +52,11 @@
             ):
                 if isinstance(arguments, str):
                     # convert to arguments list
-                    arguments = shlex.split(arguments)
+                    arguments = (
+                        stringToArgumentsWindows(arguments)
+                        if isWindowsPlatform() else
+                        shlex.split(arguments)
+                    )
                 else:
                     # create a copy of the arguments
                     arguments = arguments[:]

--- a/eric7/DebugClients/Python/coverage/cmdline.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/cmdline.py	Tue Feb 08 14:15:48 2022 +0100
@@ -17,11 +17,11 @@
 from coverage import Coverage
 from coverage import env
 from coverage.collector import CTracer
-from coverage.data import line_counts
+from coverage.config import CoverageConfig
+from coverage.data import combinable_files, debug_data_file
 from coverage.debug import info_formatter, info_header, short_stack
-from coverage.exceptions import BaseCoverageException, ExceptionDuringRun, NoSource
+from coverage.exceptions import _BaseCoverageException, _ExceptionDuringRun, NoSource
 from coverage.execfile import PyRunner
-from coverage.misc import human_sorted
 from coverage.results import Numbers, should_fail_under
 
 
@@ -40,16 +40,12 @@
         '', '--branch', action='store_true',
         help="Measure branch coverage in addition to statement coverage.",
     )
-    CONCURRENCY_CHOICES = [
-        "thread", "gevent", "greenlet", "eventlet", "multiprocessing",
-    ]
     concurrency = optparse.make_option(
-        '', '--concurrency', action='store', metavar="LIB",
-        choices=CONCURRENCY_CHOICES,
+        '', '--concurrency', action='store', metavar="LIBS",
         help=(
             "Properly measure code using a concurrency library. " +
-            "Valid values are: {}."
-        ).format(", ".join(CONCURRENCY_CHOICES)),
+            "Valid values are: {}, or a comma-list of them."
+        ).format(", ".join(sorted(CoverageConfig.CONCURRENCY_CHOICES))),
     )
     context = optparse.make_option(
         '', '--context', action='store', metavar="LABEL",
@@ -571,6 +567,11 @@
         debug = unshell_list(options.debug)
         contexts = unshell_list(options.contexts)
 
+        if options.concurrency is not None:
+            concurrency = options.concurrency.split(",")
+        else:
+            concurrency = None
+
         # Do something.
         self.coverage = Coverage(
             data_suffix=options.parallel_mode,
@@ -582,7 +583,7 @@
             omit=omit,
             include=include,
             debug=debug,
-            concurrency=options.concurrency,
+            concurrency=concurrency,
             check_preimported=True,
             context=options.context,
             messages=not options.quiet,
@@ -601,8 +602,8 @@
         elif options.action == "combine":
             if options.append:
                 self.coverage.load()
-            data_dirs = args or None
-            self.coverage.combine(data_dirs, strict=True, keep=bool(options.keep))
+            data_paths = args or None
+            self.coverage.combine(data_paths, strict=True, keep=bool(options.keep))
             self.coverage.save()
             return OK
 
@@ -778,42 +779,33 @@
         if not args:
             show_help("What information would you like: config, data, sys, premain?")
             return ERR
+        if args[1:]:
+            show_help("Only one topic at a time, please")
+            return ERR
 
-        for info in args:
-            if info == 'sys':
-                sys_info = self.coverage.sys_info()
-                print(info_header("sys"))
-                for line in info_formatter(sys_info):
-                    print(f" {line}")
-            elif info == 'data':
-                self.coverage.load()
-                data = self.coverage.get_data()
-                print(info_header("data"))
-                print(f"path: {data.data_filename()}")
-                if data:
-                    print(f"has_arcs: {data.has_arcs()!r}")
-                    summary = line_counts(data, fullpath=True)
-                    filenames = human_sorted(summary.keys())
-                    print(f"\n{len(filenames)} files:")
-                    for f in filenames:
-                        line = f"{f}: {summary[f]} lines"
-                        plugin = data.file_tracer(f)
-                        if plugin:
-                            line += f" [{plugin}]"
-                        print(line)
-                else:
-                    print("No data collected")
-            elif info == 'config':
-                print(info_header("config"))
-                config_info = self.coverage.config.__dict__.items()
-                for line in info_formatter(config_info):
-                    print(f" {line}")
-            elif info == "premain":
-                print(info_header("premain"))
-                print(short_stack())
-            else:
-                show_help(f"Don't know what you mean by {info!r}")
-                return ERR
+        if args[0] == 'sys':
+            sys_info = self.coverage.sys_info()
+            print(info_header("sys"))
+            for line in info_formatter(sys_info):
+                print(f" {line}")
+        elif args[0] == 'data':
+            print(info_header("data"))
+            data_file = self.coverage.config.data_file
+            debug_data_file(data_file)
+            for filename in combinable_files(data_file):
+                print("-----")
+                debug_data_file(filename)
+        elif args[0] == 'config':
+            print(info_header("config"))
+            config_info = sorted(self.coverage.config.__dict__.items())
+            for line in info_formatter(config_info):
+                print(f" {line}")
+        elif args[0] == "premain":
+            print(info_header("premain"))
+            print(short_stack())
+        else:
+            show_help(f"Don't know what you mean by {args[0]!r}")
+            return ERR
 
         return OK
 
@@ -887,13 +879,13 @@
         argv = sys.argv[1:]
     try:
         status = CoverageScript().command_line(argv)
-    except ExceptionDuringRun as err:
+    except _ExceptionDuringRun as err:
         # An exception was caught while running the product code.  The
-        # sys.exc_info() return tuple is packed into an ExceptionDuringRun
+        # sys.exc_info() return tuple is packed into an _ExceptionDuringRun
         # exception.
         traceback.print_exception(*err.args)    # pylint: disable=no-value-for-parameter
         status = ERR
-    except BaseCoverageException as err:
+    except _BaseCoverageException as err:
         # A controlled error inside coverage.py: print the message to the user.
         msg = err.args[0]
         print(msg)

--- a/eric7/DebugClients/Python/coverage/collector.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/collector.py	Tue Feb 08 14:15:48 2022 +0100
@@ -7,9 +7,10 @@
 import sys
 
 from coverage import env
+from coverage.config import CoverageConfig
 from coverage.debug import short_stack
 from coverage.disposition import FileDisposition
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError
 from coverage.misc import human_sorted, isolate_module
 from coverage.pytracer import PyTracer
 
@@ -55,7 +56,7 @@
     _collectors = []
 
     # The concurrency settings we support here.
-    SUPPORTED_CONCURRENCIES = {"greenlet", "eventlet", "gevent", "thread"}
+    LIGHT_THREADS = {"greenlet", "eventlet", "gevent"}
 
     def __init__(
         self, should_trace, check_include, should_start_context, file_mapper,
@@ -93,19 +94,21 @@
 
         `concurrency` is a list of strings indicating the concurrency libraries
         in use.  Valid values are "greenlet", "eventlet", "gevent", or "thread"
-        (the default).  Of these four values, only one can be supplied.  Other
-        values are ignored.
+        (the default).  "thread" can be combined with one of the other three.
+        Other values are ignored.
 
         """
         self.should_trace = should_trace
         self.check_include = check_include
         self.should_start_context = should_start_context
         self.file_mapper = file_mapper
+        self.branch = branch
         self.warn = warn
-        self.branch = branch
+        self.concurrency = concurrency
+        assert isinstance(self.concurrency, list), f"Expected a list: {self.concurrency!r}"
+
         self.threading = None
         self.covdata = None
-
         self.static_context = None
 
         self.origin = short_stack()
@@ -113,39 +116,6 @@
         self.concur_id_func = None
         self.mapped_file_cache = {}
 
-        # We can handle a few concurrency options here, but only one at a time.
-        these_concurrencies = self.SUPPORTED_CONCURRENCIES.intersection(concurrency)
-        if len(these_concurrencies) > 1:
-            raise CoverageException(f"Conflicting concurrency settings: {concurrency}")
-        self.concurrency = these_concurrencies.pop() if these_concurrencies else ''
-
-        try:
-            if self.concurrency == "greenlet":
-                import greenlet
-                self.concur_id_func = greenlet.getcurrent
-            elif self.concurrency == "eventlet":
-                import eventlet.greenthread     # pylint: disable=import-error,useless-suppression
-                self.concur_id_func = eventlet.greenthread.getcurrent
-            elif self.concurrency == "gevent":
-                import gevent                   # pylint: disable=import-error,useless-suppression
-                self.concur_id_func = gevent.getcurrent
-            elif self.concurrency == "thread" or not self.concurrency:
-                # It's important to import threading only if we need it.  If
-                # it's imported early, and the program being measured uses
-                # gevent, then gevent's monkey-patching won't work properly.
-                import threading
-                self.threading = threading
-            else:
-                raise CoverageException(f"Don't understand concurrency={concurrency}")
-        except ImportError as ex:
-            raise CoverageException(
-                "Couldn't trace with concurrency={}, the module isn't installed.".format(
-                    self.concurrency,
-                )
-            ) from ex
-
-        self.reset()
-
         if timid:
             # Being timid: use the simple Python trace function.
             self._trace_class = PyTracer
@@ -163,6 +133,54 @@
             self.supports_plugins = False
             self.packed_arcs = False
 
+        # We can handle a few concurrency options here, but only one at a time.
+        concurrencies = set(self.concurrency)
+        unknown = concurrencies - CoverageConfig.CONCURRENCY_CHOICES
+        if unknown:
+            show = ", ".join(sorted(unknown))
+            raise ConfigError(f"Unknown concurrency choices: {show}")
+        light_threads = concurrencies & self.LIGHT_THREADS
+        if len(light_threads) > 1:
+            show = ", ".join(sorted(light_threads))
+            raise ConfigError(f"Conflicting concurrency settings: {show}")
+        do_threading = False
+
+        try:
+            if "greenlet" in concurrencies:
+                tried = "greenlet"
+                import greenlet
+                self.concur_id_func = greenlet.getcurrent
+            elif "eventlet" in concurrencies:
+                tried = "eventlet"
+                import eventlet.greenthread     # pylint: disable=import-error,useless-suppression
+                self.concur_id_func = eventlet.greenthread.getcurrent
+            elif "gevent" in concurrencies:
+                tried = "gevent"
+                import gevent                   # pylint: disable=import-error,useless-suppression
+                self.concur_id_func = gevent.getcurrent
+
+            if "thread" in concurrencies:
+                do_threading = True
+        except ImportError as ex:
+            msg = f"Couldn't trace with concurrency={tried}, the module isn't installed."
+            raise ConfigError(msg) from ex
+
+        if self.concur_id_func and not hasattr(self._trace_class, "concur_id_func"):
+            raise ConfigError(
+                "Can't support concurrency={} with {}, only threads are supported.".format(
+                    tried, self.tracer_name(),
+                )
+            )
+
+        if do_threading or not concurrencies:
+            # It's important to import threading only if we need it.  If
+            # it's imported early, and the program being measured uses
+            # gevent, then gevent's monkey-patching won't work properly.
+            import threading
+            self.threading = threading
+
+        self.reset()
+
     def __repr__(self):
         return f"<Collector at 0x{id(self):x}: {self.tracer_name()}>"
 
@@ -244,13 +262,6 @@
 
         if hasattr(tracer, 'concur_id_func'):
             tracer.concur_id_func = self.concur_id_func
-        elif self.concur_id_func:
-            raise CoverageException(
-                "Can't support concurrency={} with {}, only threads are supported".format(
-                    self.concurrency, self.tracer_name(),
-                )
-            )
-
         if hasattr(tracer, 'file_tracers'):
             tracer.file_tracers = self.file_tracers
         if hasattr(tracer, 'threading'):

--- a/eric7/DebugClients/Python/coverage/config.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/config.py	Tue Feb 08 14:15:48 2022 +0100
@@ -10,7 +10,7 @@
 import os.path
 import re
 
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError
 from coverage.misc import contract, isolate_module, substitute_variables
 
 from coverage.tomlconfig import TomlConfigParser, TomlDecodeError
@@ -59,7 +59,7 @@
             real_section = section_prefix + section
             if configparser.RawConfigParser.has_section(self, real_section):
                 return configparser.RawConfigParser.options(self, real_section)
-        raise configparser.NoSectionError(section)
+        raise ConfigError(f"No section: {section!r}")
 
     def get_section(self, section):
         """Get the contents of a section, as a dictionary."""
@@ -83,7 +83,7 @@
             if configparser.RawConfigParser.has_option(self, real_section, option):
                 break
         else:
-            raise configparser.NoOptionError(option, section)
+            raise ConfigError(f"No option {option!r} in section: {section!r}")
 
         v = configparser.RawConfigParser.get(self, real_section, option, *args, **kwargs)
         v = substitute_variables(v, os.environ)
@@ -123,7 +123,7 @@
             try:
                 re.compile(value)
             except re.error as e:
-                raise CoverageException(
+                raise ConfigError(
                     f"Invalid [{section}].{option} value {value!r}: {e}"
                 ) from e
             if value:
@@ -233,11 +233,11 @@
         # Options for plugins
         self.plugin_options = {}
 
-    MUST_BE_LIST = [
+    MUST_BE_LIST = {
         "debug", "concurrency", "plugins",
         "report_omit", "report_include",
         "run_omit", "run_include",
-    ]
+    }
 
     def from_args(self, **kwargs):
         """Read config values from `kwargs`."""
@@ -272,7 +272,7 @@
         try:
             files_read = cp.read(filename)
         except (configparser.Error, TomlDecodeError) as err:
-            raise CoverageException(f"Couldn't read config file {filename}: {err}") from err
+            raise ConfigError(f"Couldn't read config file {filename}: {err}") from err
         if not files_read:
             return False
 
@@ -285,7 +285,7 @@
                 if was_set:
                     any_set = True
         except ValueError as err:
-            raise CoverageException(f"Couldn't read config file {filename}: {err}") from err
+            raise ConfigError(f"Couldn't read config file {filename}: {err}") from err
 
         # Check that there are no unrecognized options.
         all_options = collections.defaultdict(set)
@@ -334,6 +334,8 @@
         """Return a copy of the configuration."""
         return copy.deepcopy(self)
 
+    CONCURRENCY_CHOICES = {"thread", "gevent", "greenlet", "eventlet", "multiprocessing"}
+
     CONFIG_FILE_OPTIONS = [
         # These are *args for _set_attr_from_config_option:
         #   (attr, where, type_="")
@@ -443,7 +445,7 @@
             return
 
         # If we get here, we didn't find the option.
-        raise CoverageException(f"No such option: {option_name!r}")
+        raise ConfigError(f"No such option: {option_name!r}")
 
     def get_option(self, option_name):
         """Get an option from the configuration.
@@ -471,7 +473,7 @@
             return self.plugin_options.get(plugin_name, {}).get(key)
 
         # If we get here, we didn't find the option.
-        raise CoverageException(f"No such option: {option_name!r}")
+        raise ConfigError(f"No such option: {option_name!r}")
 
     def post_process_file(self, path):
         """Make final adjustments to a file path to make it usable."""
@@ -546,7 +548,7 @@
             if config_read:
                 break
             if specified_file:
-                raise CoverageException(f"Couldn't read {fname!r} as a config file")
+                raise ConfigError(f"Couldn't read {fname!r} as a config file")
 
     # $set_env.py: COVERAGE_DEBUG - Options for --debug.
     # 3) from environment variables:

--- a/eric7/DebugClients/Python/coverage/control.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/control.py	Tue Feb 08 14:15:48 2022 +0100
@@ -21,7 +21,7 @@
 from coverage.data import CoverageData, combine_parallel_data
 from coverage.debug import DebugControl, short_stack, write_formatted_info
 from coverage.disposition import disposition_debug_msg
-from coverage.exceptions import CoverageException, CoverageWarning
+from coverage.exceptions import ConfigError, CoverageException, CoverageWarning, PluginError
 from coverage.files import PathAliases, abs_file, relative_filename, set_relative_directory
 from coverage.html import HtmlReporter
 from coverage.inorout import InOrOut
@@ -79,6 +79,8 @@
     not part of the public API. They might stop working at any point.  Please
     limit yourself to documented methods to avoid problems.
 
+    Methods can raise any of the exceptions described in :ref:`api_exceptions`.
+
     """
 
     # The stack of started Coverage instances.
@@ -446,10 +448,10 @@
     def _init_for_start(self):
         """Initialization for start()"""
         # Construct the collector.
-        concurrency = self.config.concurrency or ()
+        concurrency = self.config.concurrency or []
         if "multiprocessing" in concurrency:
             if not patch_multiprocessing:
-                raise CoverageException(                    # pragma: only jython
+                raise ConfigError(                      # pragma: only jython
                     "multiprocessing is not supported on this Python"
                 )
             patch_multiprocessing(rcfile=self.config.config_file)
@@ -460,7 +462,7 @@
         elif dycon == "test_function":
             context_switchers = [should_start_context_test_function]
         else:
-            raise CoverageException(f"Don't understand dynamic_context setting: {dycon!r}")
+            raise ConfigError(f"Don't understand dynamic_context setting: {dycon!r}")
 
         context_switchers.extend(
             plugin.dynamic_context for plugin in self._plugins.context_switchers
@@ -480,10 +482,15 @@
             )
 
         suffix = self._data_suffix_specified
-        if suffix or self.config.parallel:
+        if suffix:
             if not isinstance(suffix, str):
                 # if data_suffix=True, use .machinename.pid.random
                 suffix = True
+        elif self.config.parallel:
+            if suffix is None:
+                suffix = True
+            elif not isinstance(suffix, str):
+                suffix = bool(suffix)
         else:
             suffix = None
 
@@ -835,7 +842,7 @@
                 if plugin:
                     file_reporter = plugin.file_reporter(mapped_morf)
                     if file_reporter is None:
-                        raise CoverageException(
+                        raise PluginError(
                             "Plugin {!r} did not provide a file reporter for {!r}.".format(
                                 plugin._coverage_plugin_name, morf
                             )
@@ -933,9 +940,10 @@
         """Annotate a list of modules.
 
         .. note::
-           This method has been obsoleted by more modern reporting tools,
-           including the :meth:`html_report` method.  It will be removed in a
-           future version.
+
+            This method has been obsoleted by more modern reporting tools,
+            including the :meth:`html_report` method.  It will be removed in a
+            future version.
 
         Each module in `morfs` is annotated.  The source is written to a new
         file, named with a ",cover" suffix, with each line prefixed with a
@@ -978,6 +986,7 @@
         Returns a float, the total percentage covered.
 
         .. note::
+
             The HTML report files are generated incrementally based on the
             source files and coverage results. If you modify the report files,
             the changes will not be considered.  You should be careful about

--- a/eric7/DebugClients/Python/coverage/data.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/data.py	Tue Feb 08 14:15:48 2022 +0100
@@ -13,8 +13,8 @@
 import glob
 import os.path
 
-from coverage.exceptions import CoverageException
-from coverage.misc import file_be_gone
+from coverage.exceptions import CoverageException, NoDataError
+from coverage.misc import file_be_gone, human_sorted, plural
 from coverage.sqldata import CoverageData
 
 
@@ -53,11 +53,36 @@
     hasher.update(data.file_tracer(filename))
 
 
+def combinable_files(data_file, data_paths=None):
+    """Make a list of data files to be combined.
+
+    `data_file` is a path to a data file.  `data_paths` is a list of files or
+    directories of files.
+
+    Returns a list of absolute file paths.
+    """
+    data_dir, local = os.path.split(os.path.abspath(data_file))
+
+    data_paths = data_paths or [data_dir]
+    files_to_combine = []
+    for p in data_paths:
+        if os.path.isfile(p):
+            files_to_combine.append(os.path.abspath(p))
+        elif os.path.isdir(p):
+            pattern = os.path.join(os.path.abspath(p), f"{local}.*")
+            files_to_combine.extend(glob.glob(pattern))
+        else:
+            raise NoDataError(f"Couldn't combine from non-existent path '{p}'")
+    return files_to_combine
+
+
 def combine_parallel_data(
     data, aliases=None, data_paths=None, strict=False, keep=False, message=None,
 ):
     """Combine a number of data files together.
 
+    `data` is a CoverageData.
+
     Treat `data.filename` as a file prefix, and combine the data from all
     of the data files starting with that prefix plus a dot.
 
@@ -79,24 +104,10 @@
     raised.
 
     """
-    # Because of the os.path.abspath in the constructor, data_dir will
-    # never be an empty string.
-    data_dir, local = os.path.split(data.base_filename())
-    localdot = local + '.*'
-
-    data_paths = data_paths or [data_dir]
-    files_to_combine = []
-    for p in data_paths:
-        if os.path.isfile(p):
-            files_to_combine.append(os.path.abspath(p))
-        elif os.path.isdir(p):
-            pattern = os.path.join(os.path.abspath(p), localdot)
-            files_to_combine.extend(glob.glob(pattern))
-        else:
-            raise CoverageException(f"Couldn't combine from non-existent path '{p}'")
+    files_to_combine = combinable_files(data.base_filename(), data_paths)
 
     if strict and not files_to_combine:
-        raise CoverageException("No data to combine")
+        raise NoDataError("No data to combine")
 
     files_combined = 0
     for f in files_to_combine:
@@ -127,4 +138,26 @@
                 file_be_gone(f)
 
     if strict and not files_combined:
-        raise CoverageException("No usable data files")
+        raise NoDataError("No usable data files")
+
+
+def debug_data_file(filename):
+    """Implementation of 'coverage debug data'."""
+    data = CoverageData(filename)
+    filename = data.data_filename()
+    print(f"path: {filename}")
+    if not os.path.exists(filename):
+        print("No data collected: file doesn't exist")
+        return
+    data.read()
+    print(f"has_arcs: {data.has_arcs()!r}")
+    summary = line_counts(data, fullpath=True)
+    filenames = human_sorted(summary.keys())
+    nfiles = len(filenames)
+    print(f"{nfiles} file{plural(nfiles)}:")
+    for f in filenames:
+        line = f"{f}: {summary[f]} line{plural(summary[f])}"
+        plugin = data.file_tracer(f)
+        if plugin:
+            line += f" [{plugin}]"
+        print(line)

--- a/eric7/DebugClients/Python/coverage/disposition.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/disposition.py	Tue Feb 08 14:15:48 2022 +0100
@@ -33,7 +33,7 @@
         if disp.original_filename != disp.source_filename:
             msg += f" as {disp.source_filename!r}"
         if disp.file_tracer:
-            msg += ": will be traced by %r" % disp.file_tracer
+            msg += f": will be traced by {disp.file_tracer!r}"
     else:
         msg = f"Not tracing {disp.original_filename!r}: {disp.reason}"
     return msg

--- a/eric7/DebugClients/Python/coverage/doc/CHANGES.rst	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/doc/CHANGES.rst	Tue Feb 08 14:15:48 2022 +0100
@@ -19,6 +19,48 @@
     ..  Version 9.8.1 — 2027-07-27
     ..  --------------------------
 
+.. _changes_62:
+
+Version 6.2 — 2021-11-26
+------------------------
+
+- Feature: Now the ``--concurrency`` setting can now have a list of values, so
+  that threads and another lightweight threading package can be measured
+  together, such as ``--concurrency=gevent,thread``.  Closes `issue 1012`_ and
+  `issue 1082`_.
+
+- Fix: A module specified as the ``source`` setting is imported during startup,
+  before the user program imports it.  This could cause problems if the rest of
+  the program isn't ready yet.  For example, `issue 1203`_ describes a Django
+  setting that is accessed before settings have been configured.  Now the early
+  import is wrapped in a try/except so errors then don't stop execution.
+
+- Fix: A colon in a decorator expression would cause an exclusion to end too
+  early, preventing the exclusion of the decorated function. This is now fixed.
+
+- Fix: The HTML report now will not overwrite a .gitignore file that already
+  exists in the HTML output directory (follow-on for `issue 1244`_).
+
+- API: The exceptions raised by Coverage.py have been specialized, to provide
+  finer-grained catching of exceptions by third-party code.
+
+- API: Using ``suffix=False`` when constructing a Coverage object with
+  multiprocessing wouldn't suppress the data file suffix (`issue 989`_).  This
+  is now fixed.
+
+- Debug: The `coverage debug data` command will now sniff out combinable data
+  files, and report on all of them.
+
+- Debug: The `coverage debug` command used to accept a number of topics at a
+  time, and show all of them, though this was never documented.  This no longer
+  works, to allow for command-line options in the future.
+
+.. _issue 989: https://github.com/nedbat/coveragepy/issues/989
+.. _issue 1012: https://github.com/nedbat/coveragepy/issues/1012
+.. _issue 1082: https://github.com/nedbat/coveragepy/issues/1802
+.. _issue 1203: https://github.com/nedbat/coveragepy/issues/1203
+
+
 .. _changes_612:
 
 Version 6.1.2 — 2021-11-10

--- a/eric7/DebugClients/Python/coverage/env.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/env.py	Tue Feb 08 14:15:48 2022 +0100
@@ -10,6 +10,7 @@
 # Operating systems.
 WINDOWS = sys.platform == "win32"
 LINUX = sys.platform.startswith("linux")
+OSX = sys.platform == "darwin"
 
 # Python implementations.
 CPYTHON = (platform.python_implementation() == "CPython")

--- a/eric7/DebugClients/Python/coverage/exceptions.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/exceptions.py	Tue Feb 08 14:15:48 2022 +0100
@@ -4,13 +4,27 @@
 """Exceptions coverage.py can raise."""
 
 
-class BaseCoverageException(Exception):
-    """The base of all Coverage exceptions."""
+class _BaseCoverageException(Exception):
+    """The base-base of all Coverage exceptions."""
+    pass
+
+
+class CoverageException(_BaseCoverageException):
+    """The base class of all exceptions raised by Coverage.py."""
     pass
 
 
-class CoverageException(BaseCoverageException):
-    """An exception raised by a coverage.py function."""
+class ConfigError(_BaseCoverageException):
+    """A problem with a config file, or a value in one."""
+    pass
+
+
+class DataError(CoverageException):
+    """An error in using a data file."""
+    pass
+
+class NoDataError(CoverageException):
+    """We didn't have data to work with."""
     pass
 
 
@@ -29,7 +43,12 @@
     pass
 
 
-class ExceptionDuringRun(CoverageException):
+class PluginError(CoverageException):
+    """A plugin misbehaved."""
+    pass
+
+
+class _ExceptionDuringRun(CoverageException):
     """An exception happened while running customer code.
 
     Construct it with three arguments, the values from `sys.exc_info`.
@@ -38,7 +57,7 @@
     pass
 
 
-class StopEverything(BaseCoverageException):
+class _StopEverything(_BaseCoverageException):
     """An exception that means everything should stop.
 
     The CoverageTest class converts these to SkipTest, so that when running

--- a/eric7/DebugClients/Python/coverage/execfile.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/execfile.py	Tue Feb 08 14:15:48 2022 +0100
@@ -13,7 +13,7 @@
 import types
 
 from coverage import env
-from coverage.exceptions import CoverageException, ExceptionDuringRun, NoCode, NoSource
+from coverage.exceptions import CoverageException, _ExceptionDuringRun, NoCode, NoSource
 from coverage.files import canonical_filename, python_reported_file
 from coverage.misc import isolate_module
 from coverage.phystokens import compile_unicode
@@ -144,7 +144,7 @@
                     self.arg0 = try_filename
                     break
             else:
-                raise NoSource("Can't find '__main__' module in '%s'" % self.arg0)
+                raise NoSource(f"Can't find '__main__' module in '{self.arg0}'")
 
             # Make a spec. I don't know if this is the right way to do it.
             try_filename = python_reported_file(try_filename)
@@ -233,7 +233,7 @@
                 err2.__traceback__ = err2.__traceback__.tb_next
                 sys.__excepthook__(typ2, err2, tb2.tb_next)
                 sys.stderr.write("\nOriginal exception was:\n")
-                raise ExceptionDuringRun(typ, err, tb.tb_next) from exc
+                raise _ExceptionDuringRun(typ, err, tb.tb_next) from exc
             else:
                 sys.exit(1)
         finally:
@@ -293,7 +293,7 @@
         # match or we won't run the file.
         magic = fpyc.read(4)
         if magic != PYC_MAGIC_NUMBER:
-            raise NoCode(f"Bad magic number in .pyc file: {magic} != {PYC_MAGIC_NUMBER}")
+            raise NoCode(f"Bad magic number in .pyc file: {magic!r} != {PYC_MAGIC_NUMBER!r}")
 
         date_based = True
         if env.PYBEHAVIOR.hashed_pyc_pep552:

--- a/eric7/DebugClients/Python/coverage/files.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/files.py	Tue Feb 08 14:15:48 2022 +0100
@@ -13,7 +13,7 @@
 import sys
 
 from coverage import env
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError
 from coverage.misc import contract, human_sorted, isolate_module, join_regex
 
 
@@ -137,9 +137,9 @@
         return actpath
 
 else:
-    def actual_path(filename):
+    def actual_path(path):
         """The actual path for non-Windows platforms."""
-        return filename
+        return path
 
 
 @contract(returns='unicode')
@@ -356,7 +356,7 @@
 
         # The pattern can't end with a wildcard component.
         if pattern.endswith("*"):
-            raise CoverageException("Pattern must not end with wildcards.")
+            raise ConfigError("Pattern must not end with wildcards.")
 
         # The pattern is meant to match a filepath.  Let's make it absolute
         # unless it already is, or is meant to match any prefix.

--- a/eric7/DebugClients/Python/coverage/html.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/html.py	Tue Feb 08 14:15:48 2022 +0100
@@ -12,10 +12,10 @@
 
 import coverage
 from coverage.data import add_data_to_hash
-from coverage.exceptions import CoverageException
+from coverage.exceptions import NoDataError
 from coverage.files import flat_rootname
 from coverage.misc import ensure_dir, file_be_gone, Hasher, isolate_module, format_local_datetime
-from coverage.misc import human_sorted
+from coverage.misc import human_sorted, plural
 from coverage.report import get_analysis_to_report
 from coverage.results import Numbers
 from coverage.templite import Templite
@@ -208,7 +208,7 @@
             self.html_file(fr, analysis)
 
         if not self.all_files_nums:
-            raise CoverageException("No data to report.")
+            raise NoDataError("No data to report.")
 
         self.totals = sum(self.all_files_nums)
 
@@ -226,8 +226,10 @@
 
         # .gitignore can't be copied from the source tree because it would
         # prevent the static files from being checked in.
-        with open(os.path.join(self.directory, ".gitignore"), "w") as fgi:
-            fgi.write("# Created by coverage.py\n*\n")
+        gitigore_path = os.path.join(self.directory, ".gitignore")
+        if not os.path.exists(gitigore_path):
+            with open(gitigore_path, "w") as fgi:
+                fgi.write("# Created by coverage.py\n*\n")
 
         # The user may have extra CSS they want copied.
         if self.extra_css:
@@ -329,17 +331,11 @@
 
         skipped_covered_msg = skipped_empty_msg = ""
         if self.skipped_covered_count:
-            msg = "{} {} skipped due to complete coverage."
-            skipped_covered_msg = msg.format(
-                self.skipped_covered_count,
-                "file" if self.skipped_covered_count == 1 else "files",
-            )
+            n = self.skipped_covered_count
+            skipped_covered_msg = f"{n} file{plural(n)} skipped due to complete coverage."
         if self.skipped_empty_count:
-            msg = "{} empty {} skipped."
-            skipped_empty_msg = msg.format(
-                self.skipped_empty_count,
-                "file" if self.skipped_empty_count == 1 else "files",
-            )
+            n = self.skipped_empty_count
+            skipped_empty_msg = f"{n} empty file{plural(n)} skipped."
 
         html = index_tmpl.render({
             'files': self.file_summaries,

--- a/eric7/DebugClients/Python/coverage/inorout.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/inorout.py	Tue Feb 08 14:15:48 2022 +0100
@@ -15,7 +15,7 @@
 
 from coverage import env
 from coverage.disposition import FileDisposition, disposition_init
-from coverage.exceptions import CoverageException
+from coverage.exceptions import CoverageException, PluginError
 from coverage.files import TreeMatcher, FnmatchMatcher, ModuleMatcher
 from coverage.files import prep_patterns, find_python_files, canonical_filename
 from coverage.misc import sys_modules_saved
@@ -120,7 +120,7 @@
     path = []
     try:
         spec = importlib.util.find_spec(modulename)
-    except ImportError:
+    except Exception:
         pass
     else:
         if spec is not None:
@@ -243,6 +243,9 @@
             if self.debug:
                 self.debug.write(msg)
 
+        # Generally useful information
+        debug("sys.path:" + "".join(f"\n    {p}" for p in sys.path))
+
         # Create the matchers we need for should_trace
         if self.source or self.source_pkgs:
             against = []
@@ -392,7 +395,7 @@
 
         if not disp.has_dynamic_filename:
             if not disp.source_filename:
-                raise CoverageException(
+                raise PluginError(
                     f"Plugin {plugin!r} didn't set source_filename for '{disp.original_filename}'"
                 )
             reason = self.check_include_omit_etc(disp.source_filename, frame)

--- a/eric7/DebugClients/Python/coverage/misc.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/misc.py	Tue Feb 08 14:15:48 2022 +0100
@@ -12,9 +12,7 @@
 import locale
 import os
 import os.path
-import random
 import re
-import socket
 import sys
 import types
 
@@ -184,7 +182,7 @@
 
 def join_regex(regexes):
     """Combine a list of regexes into one that matches any of them."""
-    return "|".join("(?:%s)" % r for r in regexes)
+    return "|".join(f"(?:{r})" for r in regexes)
 
 
 def file_be_gone(path):
@@ -222,26 +220,6 @@
     return encoding
 
 
-def filename_suffix(suffix):
-    """Compute a filename suffix for a data file.
-
-    If `suffix` is a string or None, simply return it. If `suffix` is True,
-    then build a suffix incorporating the hostname, process id, and a random
-    number.
-
-    Returns a string or None.
-
-    """
-    if suffix is True:
-        # If data_suffix was a simple true value, then make a suffix with
-        # plenty of distinguishing information.  We do this here in
-        # `save()` at the last minute so that the pid will be correct even
-        # if the process forks.
-        dice = random.Random(os.urandom(8)).randint(0, 999999)
-        suffix = "%s.%s.%06d" % (socket.gethostname(), os.getpid(), dice)
-    return suffix
-
-
 class Hasher:
     """Hashes Python data for fingerprinting."""
     def __init__(self):
@@ -415,3 +393,14 @@
     Returns the sorted list of items.
     """
     return sorted(items, key=lambda pair: (human_key(pair[0]), pair[1]), reverse=reverse)
+
+
+def plural(n, thing="", things=""):
+    """Pluralize a word.
+
+    If n is 1, return thing.  Otherwise return things, or thing+s.
+    """
+    if n == 1:
+        return thing
+    else:
+        return things or (thing + "s")

--- a/eric7/DebugClients/Python/coverage/parser.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/parser.py	Tue Feb 08 14:15:48 2022 +0100
@@ -13,7 +13,7 @@
 from coverage import env
 from coverage.bytecode import code_objects
 from coverage.debug import short_stack
-from coverage.exceptions import NoSource, NotPython, StopEverything
+from coverage.exceptions import NoSource, NotPython, _StopEverything
 from coverage.misc import contract, join_regex, new_contract, nice_pair, one_of
 from coverage.phystokens import compile_unicode, generate_tokens, neuter_encoding_declaration
 
@@ -67,9 +67,6 @@
         # The raw line numbers of excluded lines of code, as marked by pragmas.
         self.raw_excluded = set()
 
-        # The line numbers of class and function definitions.
-        self.raw_classdefs = set()
-
         # The line numbers of docstring lines.
         self.raw_docstrings = set()
 
@@ -120,6 +117,7 @@
         first_line = None
         empty = True
         first_on_line = True
+        nesting = 0
 
         tokgen = generate_tokens(self.text)
         for toktype, ttext, (slineno, _), (elineno, _), ltext in tokgen:
@@ -132,14 +130,8 @@
                 indent += 1
             elif toktype == token.DEDENT:
                 indent -= 1
-            elif toktype == token.NAME:
-                if ttext == 'class':
-                    # Class definitions look like branches in the bytecode, so
-                    # we need to exclude them.  The simplest way is to note the
-                    # lines with the 'class' keyword.
-                    self.raw_classdefs.add(slineno)
             elif toktype == token.OP:
-                if ttext == ':':
+                if ttext == ':' and nesting == 0:
                     should_exclude = (elineno in self.raw_excluded) or excluding_decorators
                     if not excluding and should_exclude:
                         # Start excluding a suite.  We trigger off of the colon
@@ -155,6 +147,10 @@
                         excluding_decorators = True
                     if excluding_decorators:
                         self.raw_excluded.add(elineno)
+                elif ttext in "([{":
+                    nesting += 1
+                elif ttext in ")]}":
+                    nesting -= 1
             elif toktype == token.STRING and prev_toktype == token.INDENT:
                 # Strings that are first on an indented line are docstrings.
                 # (a trick from trace.py in the stdlib.) This works for
@@ -296,12 +292,6 @@
                 continue
             exit_counts[l1] += 1
 
-        # Class definitions have one extra exit, so remove one for each:
-        for l in self.raw_classdefs:
-            # Ensure key is there: class definitions can include excluded lines.
-            if l in exit_counts:
-                exit_counts[l] -= 1
-
         return exit_counts
 
     def missing_arc_description(self, start, end, executed_arcs=None):
@@ -366,7 +356,7 @@
         # attributes on code objects that we need to do the analysis.
         for attr in ['co_lnotab', 'co_firstlineno']:
             if not hasattr(self.code, attr):
-                raise StopEverything(                   # pragma: only jython
+                raise _StopEverything(                  # pragma: only jython
                     "This implementation of Python doesn't support code analysis.\n" +
                     "Run coverage.py under another Python for this command."
                 )

--- a/eric7/DebugClients/Python/coverage/plugin.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/plugin.py	Tue Feb 08 14:15:48 2022 +0100
@@ -112,6 +112,8 @@
 
 """
 
+import functools
+
 from coverage import files
 from coverage.misc import contract, _needs_to_implement
 
@@ -315,6 +317,7 @@
         return lineno, lineno
 
 
+@functools.total_ordering
 class FileReporter:
     """Support needed for files during the analysis and reporting phases.
 
@@ -509,25 +512,10 @@
         for line in self.source().splitlines():
             yield [('txt', line)]
 
-    # Annoying comparison operators. Py3k wants __lt__ etc, and Py2k needs all
-    # of them defined.
-
     def __eq__(self, other):
         return isinstance(other, FileReporter) and self.filename == other.filename
 
-    def __ne__(self, other):
-        return not (self == other)
-
     def __lt__(self, other):
-        return self.filename < other.filename
-
-    def __le__(self, other):
-        return self.filename <= other.filename
-
-    def __gt__(self, other):
-        return self.filename > other.filename
-
-    def __ge__(self, other):
-        return self.filename >= other.filename
+        return isinstance(other, FileReporter) and self.filename < other.filename
 
     __hash__ = None     # This object doesn't need to be hashed.

--- a/eric7/DebugClients/Python/coverage/plugin_support.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/plugin_support.py	Tue Feb 08 14:15:48 2022 +0100
@@ -7,7 +7,7 @@
 import os.path
 import sys
 
-from coverage.exceptions import CoverageException
+from coverage.exceptions import PluginError
 from coverage.misc import isolate_module
 from coverage.plugin import CoveragePlugin, FileTracer, FileReporter
 
@@ -44,7 +44,7 @@
 
             coverage_init = getattr(mod, "coverage_init", None)
             if not coverage_init:
-                raise CoverageException(
+                raise PluginError(
                     f"Plugin module {module!r} didn't define a coverage_init function"
                 )
 
@@ -110,11 +110,9 @@
         if specialized is not None:
             specialized.append(plugin)
 
-    def __nonzero__(self):
+    def __bool__(self):
         return bool(self.order)
 
-    __bool__ = __nonzero__
-
     def __iter__(self):
         return iter(self.order)
 

--- a/eric7/DebugClients/Python/coverage/report.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/report.py	Tue Feb 08 14:15:48 2022 +0100
@@ -5,7 +5,7 @@
 
 import sys
 
-from coverage.exceptions import CoverageException, NotPython
+from coverage.exceptions import CoverageException, NoDataError, NotPython
 from coverage.files import prep_patterns, FnmatchMatcher
 from coverage.misc import ensure_dir_for_file, file_be_gone
 
@@ -65,7 +65,7 @@
         file_reporters = [fr for fr in file_reporters if not matcher.match(fr.filename)]
 
     if not file_reporters:
-        raise CoverageException("No data to report.")
+        raise NoDataError("No data to report.")
 
     for fr in sorted(file_reporters):
         try:

--- a/eric7/DebugClients/Python/coverage/results.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/results.py	Tue Feb 08 14:15:48 2022 +0100
@@ -6,7 +6,7 @@
 import collections
 
 from coverage.debug import SimpleReprMixin
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError
 from coverage.misc import contract, nice_pair
 
 
@@ -317,7 +317,7 @@
             for ex in sorted(exits):
                 if line not in lines and ex not in lines:
                     dest = (ex if ex > 0 else "exit")
-                    line_items.append((line, "%d->%s" % (line, dest)))
+                    line_items.append((line, f"{line}->{dest}"))
 
     ret = ', '.join(t[-1] for t in sorted(line_items))
     return ret
@@ -337,7 +337,7 @@
     # We can never achieve higher than 100% coverage, or less than zero.
     if not (0 <= fail_under <= 100.0):
         msg = f"fail_under={fail_under} is invalid. Must be between 0 and 100."
-        raise CoverageException(msg)
+        raise ConfigError(msg)
 
     # Special case for fail_under=100, it must really be 100.
     if fail_under == 100.0 and total != 100.0:

--- a/eric7/DebugClients/Python/coverage/sqldata.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/sqldata.py	Tue Feb 08 14:15:48 2022 +0100
@@ -12,16 +12,18 @@
 import glob
 import itertools
 import os
+import random
 import re
+import socket
 import sqlite3
 import sys
 import threading
 import zlib
 
 from coverage.debug import NoDebugging, SimpleReprMixin, clipped_repr
-from coverage.exceptions import CoverageException
+from coverage.exceptions import CoverageException, DataError
 from coverage.files import PathAliases
-from coverage.misc import contract, file_be_gone, filename_suffix, isolate_module
+from coverage.misc import contract, file_be_gone, isolate_module
 from coverage.numbits import numbits_to_nums, numbits_union, nums_to_numbits
 from coverage.version import __version__
 
@@ -191,7 +193,7 @@
 
         Arguments:
             basename (str): the base name of the data file, defaulting to
-                ".coverage".
+                ".coverage". This can be a path to a file in another directory.
             suffix (str or bool): has the same meaning as the `data_suffix`
                 argument to :class:`coverage.Coverage`.
             no_disk (bool): if True, keep all data in memory, and don't
@@ -287,14 +289,14 @@
             try:
                 schema_version, = db.execute_one("select version from coverage_schema")
             except Exception as exc:
-                raise CoverageException(
+                raise DataError(
                     "Data file {!r} doesn't seem to be a coverage data file: {}".format(
                         self._filename, exc
                     )
                 ) from exc
             else:
                 if schema_version != SCHEMA_VERSION:
-                    raise CoverageException(
+                    raise DataError(
                         "Couldn't use data file {!r}: wrong schema: {} instead of {}".format(
                             self._filename, schema_version, SCHEMA_VERSION
                         )
@@ -316,7 +318,7 @@
                 self._create_db()
         return self._dbs[threading.get_ident()]
 
-    def __nonzero__(self):
+    def __bool__(self):
         if (threading.get_ident() not in self._dbs and not os.path.exists(self._filename)):
             return False
         try:
@@ -326,8 +328,6 @@
         except CoverageException:
             return False
 
-    __bool__ = __nonzero__
-
     @contract(returns="bytes")
     def dumps(self):
         """Serialize the current data to a byte string.
@@ -370,9 +370,9 @@
         if self._debug.should("dataio"):
             self._debug.write(f"Loading data into data file {self._filename!r}")
         if data[:1] != b"z":
-            raise CoverageException(
+            raise DataError(
                 f"Unrecognized serialization: {data[:40]!r} (head of {len(data)} bytes)"
-                )
+            )
         script = zlib.decompress(data[1:]).decode("utf-8")
         self._dbs[threading.get_ident()] = db = SqliteDb(self._filename, self._debug)
         with db:
@@ -513,9 +513,9 @@
         assert lines or arcs
         assert not (lines and arcs)
         if lines and self._has_arcs:
-            raise CoverageException("Can't add line measurements to existing branch data")
+            raise DataError("Can't add line measurements to existing branch data")
         if arcs and self._has_lines:
-            raise CoverageException("Can't add branch measurements to existing line data")
+            raise DataError("Can't add branch measurements to existing line data")
         if not self._has_arcs and not self._has_lines:
             self._has_lines = lines
             self._has_arcs = arcs
@@ -541,14 +541,14 @@
             for filename, plugin_name in file_tracers.items():
                 file_id = self._file_id(filename)
                 if file_id is None:
-                    raise CoverageException(
+                    raise DataError(
                         f"Can't add file tracer data for unmeasured file '{filename}'"
                     )
 
                 existing_plugin = self.file_tracer(filename)
                 if existing_plugin:
                     if existing_plugin != plugin_name:
-                        raise CoverageException(
+                        raise DataError(
                             "Conflicting file tracer name for '{}': {!r} vs {!r}".format(
                                 filename, existing_plugin, plugin_name,
                             )
@@ -578,7 +578,7 @@
         self._start_using()
         with self._connect(): # Use this to get one transaction.
             if not self._has_arcs and not self._has_lines:
-                raise CoverageException("Can't touch files in an empty CoverageData")
+                raise DataError("Can't touch files in an empty CoverageData")
 
             for filename in filenames:
                 self._file_id(filename, add=True)
@@ -597,9 +597,9 @@
                 getattr(other_data, "_filename", "???"),
             ))
         if self._has_lines and other_data._has_arcs:
-            raise CoverageException("Can't combine arc data with line data")
+            raise DataError("Can't combine arc data with line data")
         if self._has_arcs and other_data._has_lines:
-            raise CoverageException("Can't combine line data with arc data")
+            raise DataError("Can't combine line data with arc data")
 
         aliases = aliases or PathAliases()
 
@@ -692,7 +692,7 @@
                 other_tracer = tracers.get(path, "")
                 # If there is no tracer, there is always the None tracer.
                 if this_tracer is not None and this_tracer != other_tracer:
-                    raise CoverageException(
+                    raise DataError(
                         "Conflicting file tracer name for '{}': {!r} vs {!r}".format(
                             path, this_tracer, other_tracer
                         )
@@ -1004,6 +1004,26 @@
         ]
 
 
+def filename_suffix(suffix):
+    """Compute a filename suffix for a data file.
+
+    If `suffix` is a string or None, simply return it. If `suffix` is True,
+    then build a suffix incorporating the hostname, process id, and a random
+    number.
+
+    Returns a string or None.
+
+    """
+    if suffix is True:
+        # If data_suffix was a simple true value, then make a suffix with
+        # plenty of distinguishing information.  We do this here in
+        # `save()` at the last minute so that the pid will be correct even
+        # if the process forks.
+        dice = random.Random(os.urandom(8)).randint(0, 999999)
+        suffix = "%s.%s.%06d" % (socket.gethostname(), os.getpid(), dice)
+    return suffix
+
+
 class SqliteDb(SimpleReprMixin):
     """A simple abstraction over a SQLite database.
 
@@ -1035,7 +1055,7 @@
         try:
             self.con = sqlite3.connect(self.filename, check_same_thread=False)
         except sqlite3.Error as exc:
-            raise CoverageException(f"Couldn't use data file {self.filename!r}: {exc}") from exc
+            raise DataError(f"Couldn't use data file {self.filename!r}: {exc}") from exc
 
         self.con.create_function("REGEXP", 2, _regexp)
 
@@ -1068,7 +1088,7 @@
             except Exception as exc:
                 if self.debug:
                     self.debug.write(f"EXCEPTION from __exit__: {exc}")
-                raise CoverageException(f"Couldn't end data file {self.filename!r}: {exc}") from exc
+                raise DataError(f"Couldn't end data file {self.filename!r}: {exc}") from exc
 
     def execute(self, sql, parameters=()):
         """Same as :meth:`python:sqlite3.Connection.execute`."""
@@ -1099,7 +1119,7 @@
                 pass
             if self.debug:
                 self.debug.write(f"EXCEPTION from execute: {msg}")
-            raise CoverageException(f"Couldn't use data file {self.filename!r}: {msg}") from exc
+            raise DataError(f"Couldn't use data file {self.filename!r}: {msg}") from exc
 
     def execute_one(self, sql, parameters=()):
         """Execute a statement and return the one row that results.

--- a/eric7/DebugClients/Python/coverage/summary.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/summary.py	Tue Feb 08 14:15:48 2022 +0100
@@ -5,7 +5,7 @@
 
 import sys
 
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError, NoDataError
 from coverage.misc import human_sorted_items
 from coverage.report import get_analysis_to_report
 from coverage.results import Numbers
@@ -103,7 +103,7 @@
         else:
             position = column_order.get(sort_option)
             if position is None:
-                raise CoverageException(f"Invalid sorting option: {self.config.sort!r}")
+                raise ConfigError(f"Invalid sorting option: {self.config.sort!r}")
             lines.sort(key=lambda l: (l[1][position], l[0]), reverse=reverse)
 
         for line in lines:
@@ -122,7 +122,7 @@
 
         # Write other final lines.
         if not self.total.n_files and not self.skipped_count:
-            raise CoverageException("No data to report.")
+            raise NoDataError("No data to report.")
 
         if self.config.skip_covered and self.skipped_count:
             self.writeout(

--- a/eric7/DebugClients/Python/coverage/tomlconfig.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/tomlconfig.py	Tue Feb 08 14:15:48 2022 +0100
@@ -7,7 +7,7 @@
 import os
 import re
 
-from coverage.exceptions import CoverageException
+from coverage.exceptions import ConfigError
 from coverage.misc import import_third_party, substitute_variables
 
 # TOML support is an install-time extra option. (Import typing is here because
@@ -57,7 +57,7 @@
             if self.our_file or has_toml:
                 # Looks like they meant to read TOML, but we can't read it.
                 msg = "Can't read {!r} without TOML support. Install with [toml] extra"
-                raise CoverageException(msg.format(filename))
+                raise ConfigError(msg.format(filename))
             return []
 
     def _get_section(self, section):
@@ -148,7 +148,7 @@
             try:
                 re.compile(value)
             except re.error as e:
-                raise CoverageException(f"Invalid [{name}].{option} value {value!r}: {e}") from e
+                raise ConfigError(f"Invalid [{name}].{option} value {value!r}: {e}") from e
         return values
 
     def getint(self, section, option):

--- a/eric7/DebugClients/Python/coverage/version.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/version.py	Tue Feb 08 14:15:48 2022 +0100
@@ -5,7 +5,7 @@
 # This file is exec'ed in setup.py, don't import anything!
 
 # Same semantics as sys.version_info.
-version_info = (6, 1, 2, "final", 0)
+version_info = (6, 2, 0, "final", 0)
 
 
 def _make_version(major, minor, micro, releaselevel, serial):
@@ -16,7 +16,7 @@
         version += ".%d" % (micro,)
     if releaselevel != 'final':
         short = {'alpha': 'a', 'beta': 'b', 'candidate': 'rc'}[releaselevel]
-        version += "%s%d" % (short, serial)
+        version += f"{short}{serial}"
     return version
 
 

--- a/eric7/DebugClients/Python/coverage/xmlreport.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/DebugClients/Python/coverage/xmlreport.py	Tue Feb 08 14:15:48 2022 +0100
@@ -67,9 +67,9 @@
         xcoverage.setAttribute("version", __version__)
         xcoverage.setAttribute("timestamp", str(int(time.time()*1000)))
         xcoverage.appendChild(self.xml_out.createComment(
-            " Generated by coverage.py: %s " % __url__
+            f" Generated by coverage.py: {__url__} "
             ))
-        xcoverage.appendChild(self.xml_out.createComment(" Based on %s " % DTD_URL))
+        xcoverage.appendChild(self.xml_out.createComment(f" Based on {DTD_URL} "))
 
         # Call xml_file for each file in the data.
         for fr, analysis in get_analysis_to_report(self.coverage, morfs):

Binary file eric7/Documentation/Help/source.qch has changed

--- a/eric7/Documentation/Help/source.qhp	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Help/source.qhp	Tue Feb 08 14:15:48 2022 +0100
@@ -214,6 +214,9 @@
             <section title="eric7.Graphics.UMLSceneSizeDialog" ref="eric7.Graphics.UMLSceneSizeDialog.html" />
           </section>
           <section title="eric7.HelpViewer" ref="index-eric7.HelpViewer.html">
+            <section title="eric7.HelpViewer.HelpBookmarkPropertiesDialog" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html" />
+            <section title="eric7.HelpViewer.HelpBookmarksImportDialog" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html" />
+            <section title="eric7.HelpViewer.HelpBookmarksWidget" ref="eric7.HelpViewer.HelpBookmarksWidget.html" />
             <section title="eric7.HelpViewer.HelpViewerImpl" ref="eric7.HelpViewer.HelpViewerImpl.html" />
             <section title="eric7.HelpViewer.HelpViewerImplQTB" ref="eric7.HelpViewer.HelpViewerImplQTB.html" />
             <section title="eric7.HelpViewer.HelpViewerImplQWE" ref="eric7.HelpViewer.HelpViewerImplQWE.html" />
@@ -244,6 +247,7 @@
           </section>
           <section title="eric7.MicroPython" ref="index-eric7.MicroPython.html">
             <section title="eric7.MicroPython.AddEditDevicesDialog" ref="eric7.MicroPython.AddEditDevicesDialog.html" />
+            <section title="eric7.MicroPython.BoardDataDialog" ref="eric7.MicroPython.BoardDataDialog.html" />
             <section title="eric7.MicroPython.CircuitPythonDevices" ref="eric7.MicroPython.CircuitPythonDevices.html" />
             <section title="eric7.MicroPython.ConnectionSelectionDialog" ref="eric7.MicroPython.ConnectionSelectionDialog.html" />
             <section title="eric7.MicroPython.EspBackupRestoreFirmwareDialog" ref="eric7.MicroPython.EspBackupRestoreFirmwareDialog.html" />
@@ -1999,6 +2003,10 @@
       <keyword name="BinaryModel.setBitsAndValue" id="BinaryModel.setBitsAndValue" ref="eric7.UI.NumbersWidget.html#BinaryModel.setBitsAndValue" />
       <keyword name="BinaryModel.setData" id="BinaryModel.setData" ref="eric7.UI.NumbersWidget.html#BinaryModel.setData" />
       <keyword name="BinaryModel.setValue" id="BinaryModel.setValue" ref="eric7.UI.NumbersWidget.html#BinaryModel.setValue" />
+      <keyword name="BoardDataDialog" id="BoardDataDialog" ref="eric7.MicroPython.BoardDataDialog.html#BoardDataDialog" />
+      <keyword name="BoardDataDialog (Constructor)" id="BoardDataDialog (Constructor)" ref="eric7.MicroPython.BoardDataDialog.html#BoardDataDialog.__init__" />
+      <keyword name="BoardDataDialog (Module)" id="BoardDataDialog (Module)" ref="eric7.MicroPython.BoardDataDialog.html" />
+      <keyword name="BoardDataDialog.__createHeader" id="BoardDataDialog.__createHeader" ref="eric7.MicroPython.BoardDataDialog.html#BoardDataDialog.__createHeader" />
       <keyword name="BookmarkActionSelectionDialog" id="BookmarkActionSelectionDialog" ref="eric7.WebBrowser.UrlBar.BookmarkActionSelectionDialog.html#BookmarkActionSelectionDialog" />
       <keyword name="BookmarkActionSelectionDialog (Constructor)" id="BookmarkActionSelectionDialog (Constructor)" ref="eric7.WebBrowser.UrlBar.BookmarkActionSelectionDialog.html#BookmarkActionSelectionDialog.__init__" />
       <keyword name="BookmarkActionSelectionDialog (Module)" id="BookmarkActionSelectionDialog (Module)" ref="eric7.WebBrowser.UrlBar.BookmarkActionSelectionDialog.html" />
@@ -2257,6 +2265,7 @@
       <keyword name="Browser._keyboardSearchType" id="Browser._keyboardSearchType" ref="eric7.UI.Browser.html#Browser._keyboardSearchType" />
       <keyword name="Browser._newDirectory" id="Browser._newDirectory" ref="eric7.UI.Browser.html#Browser._newDirectory" />
       <keyword name="Browser._newFile" id="Browser._newFile" ref="eric7.UI.Browser.html#Browser._newFile" />
+      <keyword name="Browser._openFileInEditor" id="Browser._openFileInEditor" ref="eric7.UI.Browser.html#Browser._openFileInEditor" />
       <keyword name="Browser._openHexEditor" id="Browser._openHexEditor" ref="eric7.UI.Browser.html#Browser._openHexEditor" />
       <keyword name="Browser._openItem" id="Browser._openItem" ref="eric7.UI.Browser.html#Browser._openItem" />
       <keyword name="Browser._resizeColumns" id="Browser._resizeColumns" ref="eric7.UI.Browser.html#Browser._resizeColumns" />
@@ -7175,6 +7184,35 @@
       <keyword name="HashPrefixList (Constructor)" id="HashPrefixList (Constructor)" ref="eric7.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__init__" />
       <keyword name="HashPrefixList.__iter__" id="HashPrefixList.__iter__" ref="eric7.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__iter__" />
       <keyword name="HashPrefixList.__len__" id="HashPrefixList.__len__" ref="eric7.WebBrowser.SafeBrowsing.SafeBrowsingThreatList.html#HashPrefixList.__len__" />
+      <keyword name="HelpBookmarkPropertiesDialog" id="HelpBookmarkPropertiesDialog" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html#HelpBookmarkPropertiesDialog" />
+      <keyword name="HelpBookmarkPropertiesDialog (Constructor)" id="HelpBookmarkPropertiesDialog (Constructor)" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html#HelpBookmarkPropertiesDialog.__init__" />
+      <keyword name="HelpBookmarkPropertiesDialog (Module)" id="HelpBookmarkPropertiesDialog (Module)" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html" />
+      <keyword name="HelpBookmarkPropertiesDialog.__updateOkButton" id="HelpBookmarkPropertiesDialog.__updateOkButton" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html#HelpBookmarkPropertiesDialog.__updateOkButton" />
+      <keyword name="HelpBookmarkPropertiesDialog.getData" id="HelpBookmarkPropertiesDialog.getData" ref="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html#HelpBookmarkPropertiesDialog.getData" />
+      <keyword name="HelpBookmarksImportDialog" id="HelpBookmarksImportDialog" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html#HelpBookmarksImportDialog" />
+      <keyword name="HelpBookmarksImportDialog (Constructor)" id="HelpBookmarksImportDialog (Constructor)" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html#HelpBookmarksImportDialog.__init__" />
+      <keyword name="HelpBookmarksImportDialog (Module)" id="HelpBookmarksImportDialog (Module)" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html" />
+      <keyword name="HelpBookmarksImportDialog.__updateOkButton" id="HelpBookmarksImportDialog.__updateOkButton" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html#HelpBookmarksImportDialog.__updateOkButton" />
+      <keyword name="HelpBookmarksImportDialog.getData" id="HelpBookmarksImportDialog.getData" ref="eric7.HelpViewer.HelpBookmarksImportDialog.html#HelpBookmarksImportDialog.getData" />
+      <keyword name="HelpBookmarksWidget" id="HelpBookmarksWidget" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget" />
+      <keyword name="HelpBookmarksWidget (Constructor)" id="HelpBookmarksWidget (Constructor)" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__init__" />
+      <keyword name="HelpBookmarksWidget (Module)" id="HelpBookmarksWidget (Module)" ref="eric7.HelpViewer.HelpBookmarksWidget.html" />
+      <keyword name="HelpBookmarksWidget.__addBookmark" id="HelpBookmarksWidget.__addBookmark" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__addBookmark" />
+      <keyword name="HelpBookmarksWidget.__bookmarkActivated" id="HelpBookmarksWidget.__bookmarkActivated" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__bookmarkActivated" />
+      <keyword name="HelpBookmarksWidget.__bookmarkCurrentPage" id="HelpBookmarksWidget.__bookmarkCurrentPage" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__bookmarkCurrentPage" />
+      <keyword name="HelpBookmarksWidget.__deleteBookmarks" id="HelpBookmarksWidget.__deleteBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__deleteBookmarks" />
+      <keyword name="HelpBookmarksWidget.__editBookmark" id="HelpBookmarksWidget.__editBookmark" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__editBookmark" />
+      <keyword name="HelpBookmarksWidget.__exportBookmarks" id="HelpBookmarksWidget.__exportBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__exportBookmarks" />
+      <keyword name="HelpBookmarksWidget.__importBookmarks" id="HelpBookmarksWidget.__importBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__importBookmarks" />
+      <keyword name="HelpBookmarksWidget.__loadBookmarks" id="HelpBookmarksWidget.__loadBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__loadBookmarks" />
+      <keyword name="HelpBookmarksWidget.__newBookmark" id="HelpBookmarksWidget.__newBookmark" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__newBookmark" />
+      <keyword name="HelpBookmarksWidget.__openBookmarks" id="HelpBookmarksWidget.__openBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__openBookmarks" />
+      <keyword name="HelpBookmarksWidget.__saveBookmarks" id="HelpBookmarksWidget.__saveBookmarks" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__saveBookmarks" />
+      <keyword name="HelpBookmarksWidget.__showBackgroundMenu" id="HelpBookmarksWidget.__showBackgroundMenu" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__showBackgroundMenu" />
+      <keyword name="HelpBookmarksWidget.__showBookmarkContextMenu" id="HelpBookmarksWidget.__showBookmarkContextMenu" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__showBookmarkContextMenu" />
+      <keyword name="HelpBookmarksWidget.__showBookmarksContextMenu" id="HelpBookmarksWidget.__showBookmarksContextMenu" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__showBookmarksContextMenu" />
+      <keyword name="HelpBookmarksWidget.__showContextMenu" id="HelpBookmarksWidget.__showContextMenu" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.__showContextMenu" />
+      <keyword name="HelpBookmarksWidget.addBookmark" id="HelpBookmarksWidget.addBookmark" ref="eric7.HelpViewer.HelpBookmarksWidget.html#HelpBookmarksWidget.addBookmark" />
       <keyword name="HelpDocsInstaller" id="HelpDocsInstaller" ref="eric7.WebBrowser.QtHelp.HelpDocsInstaller.html#HelpDocsInstaller" />
       <keyword name="HelpDocsInstaller (Constructor)" id="HelpDocsInstaller (Constructor)" ref="eric7.WebBrowser.QtHelp.HelpDocsInstaller.html#HelpDocsInstaller.__init__" />
       <keyword name="HelpDocsInstaller (Module)" id="HelpDocsInstaller (Module)" ref="eric7.WebBrowser.QtHelp.HelpDocsInstaller.html" />
@@ -7244,6 +7282,7 @@
       <keyword name="HelpViewerImplQTB" id="HelpViewerImplQTB" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB" />
       <keyword name="HelpViewerImplQTB (Constructor)" id="HelpViewerImplQTB (Constructor)" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB.__init__" />
       <keyword name="HelpViewerImplQTB (Module)" id="HelpViewerImplQTB (Module)" ref="eric7.HelpViewer.HelpViewerImplQTB.html" />
+      <keyword name="HelpViewerImplQTB.__bookmarkPage" id="HelpViewerImplQTB.__bookmarkPage" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB.__bookmarkPage" />
       <keyword name="HelpViewerImplQTB.__canLoadResource" id="HelpViewerImplQTB.__canLoadResource" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB.__canLoadResource" />
       <keyword name="HelpViewerImplQTB.__closeOtherPages" id="HelpViewerImplQTB.__closeOtherPages" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB.__closeOtherPages" />
       <keyword name="HelpViewerImplQTB.__closePage" id="HelpViewerImplQTB.__closePage" ref="eric7.HelpViewer.HelpViewerImplQTB.html#HelpViewerImplQTB.__closePage" />
@@ -7277,6 +7316,7 @@
       <keyword name="HelpViewerImplQWE" id="HelpViewerImplQWE" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE" />
       <keyword name="HelpViewerImplQWE (Constructor)" id="HelpViewerImplQWE (Constructor)" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE.__init__" />
       <keyword name="HelpViewerImplQWE (Module)" id="HelpViewerImplQWE (Module)" ref="eric7.HelpViewer.HelpViewerImplQWE.html" />
+      <keyword name="HelpViewerImplQWE.__bookmarkPage" id="HelpViewerImplQWE.__bookmarkPage" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE.__bookmarkPage" />
       <keyword name="HelpViewerImplQWE.__closeOtherPages" id="HelpViewerImplQWE.__closeOtherPages" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE.__closeOtherPages" />
       <keyword name="HelpViewerImplQWE.__closePage" id="HelpViewerImplQWE.__closePage" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE.__closePage" />
       <keyword name="HelpViewerImplQWE.__copyLink" id="HelpViewerImplQWE.__copyLink" ref="eric7.HelpViewer.HelpViewerImplQWE.html#HelpViewerImplQWE.__copyLink" />
@@ -7366,6 +7406,7 @@
       <keyword name="HelpViewerWidget.__zoomReset" id="HelpViewerWidget.__zoomReset" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.__zoomReset" />
       <keyword name="HelpViewerWidget.activate" id="HelpViewerWidget.activate" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.activate" />
       <keyword name="HelpViewerWidget.addPage" id="HelpViewerWidget.addPage" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.addPage" />
+      <keyword name="HelpViewerWidget.bookmarkPage" id="HelpViewerWidget.bookmarkPage" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.bookmarkPage" />
       <keyword name="HelpViewerWidget.closeAllPages" id="HelpViewerWidget.closeAllPages" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.closeAllPages" />
       <keyword name="HelpViewerWidget.closeCurrentPage" id="HelpViewerWidget.closeCurrentPage" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.closeCurrentPage" />
       <keyword name="HelpViewerWidget.closeOtherPages" id="HelpViewerWidget.closeOtherPages" ref="eric7.HelpViewer.HelpViewerWidget.html#HelpViewerWidget.closeOtherPages" />
@@ -10216,6 +10257,7 @@
       <keyword name="MicroPythonCommandsInterface.executeAsync" id="MicroPythonCommandsInterface.executeAsync" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.executeAsync" />
       <keyword name="MicroPythonCommandsInterface.fileSystemInfo" id="MicroPythonCommandsInterface.fileSystemInfo" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.fileSystemInfo" />
       <keyword name="MicroPythonCommandsInterface.get" id="MicroPythonCommandsInterface.get" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.get" />
+      <keyword name="MicroPythonCommandsInterface.getBoardInformation" id="MicroPythonCommandsInterface.getBoardInformation" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.getBoardInformation" />
       <keyword name="MicroPythonCommandsInterface.getImplementation" id="MicroPythonCommandsInterface.getImplementation" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.getImplementation" />
       <keyword name="MicroPythonCommandsInterface.getTime" id="MicroPythonCommandsInterface.getTime" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.getTime" />
       <keyword name="MicroPythonCommandsInterface.handlePreferencesChanged" id="MicroPythonCommandsInterface.handlePreferencesChanged" ref="eric7.MicroPython.MicroPythonCommandsInterface.html#MicroPythonCommandsInterface.handlePreferencesChanged" />
@@ -10376,6 +10418,7 @@
       <keyword name="MicroPythonWidget.__replEditMouseReleaseEvent" id="MicroPythonWidget.__replEditMouseReleaseEvent" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__replEditMouseReleaseEvent" />
       <keyword name="MicroPythonWidget.__setCharFormat" id="MicroPythonWidget.__setCharFormat" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__setCharFormat" />
       <keyword name="MicroPythonWidget.__setConnected" id="MicroPythonWidget.__setConnected" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__setConnected" />
+      <keyword name="MicroPythonWidget.__showBoardInformation" id="MicroPythonWidget.__showBoardInformation" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__showBoardInformation" />
       <keyword name="MicroPythonWidget.__showContextMenu" id="MicroPythonWidget.__showContextMenu" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__showContextMenu" />
       <keyword name="MicroPythonWidget.__showDeviceTime" id="MicroPythonWidget.__showDeviceTime" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__showDeviceTime" />
       <keyword name="MicroPythonWidget.__showDeviceVersion" id="MicroPythonWidget.__showDeviceVersion" ref="eric7.MicroPython.MicroPythonWidget.html#MicroPythonWidget.__showDeviceVersion" />
@@ -12198,6 +12241,7 @@
       <keyword name="ProjectOthersBrowser._contextMenuRequested" id="ProjectOthersBrowser._contextMenuRequested" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._contextMenuRequested" />
       <keyword name="ProjectOthersBrowser._createPopupMenus" id="ProjectOthersBrowser._createPopupMenus" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._createPopupMenus" />
       <keyword name="ProjectOthersBrowser._editPixmap" id="ProjectOthersBrowser._editPixmap" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._editPixmap" />
+      <keyword name="ProjectOthersBrowser._openFileInEditor" id="ProjectOthersBrowser._openFileInEditor" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._openFileInEditor" />
       <keyword name="ProjectOthersBrowser._openHexEditor" id="ProjectOthersBrowser._openHexEditor" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._openHexEditor" />
       <keyword name="ProjectOthersBrowser._openItem" id="ProjectOthersBrowser._openItem" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._openItem" />
       <keyword name="ProjectOthersBrowser._showContextMenu" id="ProjectOthersBrowser._showContextMenu" ref="eric7.Project.ProjectOthersBrowser.html#ProjectOthersBrowser._showContextMenu" />
@@ -19250,6 +19294,9 @@
       <file>eric7.Graphics.UMLGraphicsView.html</file>
       <file>eric7.Graphics.UMLItem.html</file>
       <file>eric7.Graphics.UMLSceneSizeDialog.html</file>
+      <file>eric7.HelpViewer.HelpBookmarkPropertiesDialog.html</file>
+      <file>eric7.HelpViewer.HelpBookmarksImportDialog.html</file>
+      <file>eric7.HelpViewer.HelpBookmarksWidget.html</file>
       <file>eric7.HelpViewer.HelpViewerImpl.html</file>
       <file>eric7.HelpViewer.HelpViewerImplQTB.html</file>
       <file>eric7.HelpViewer.HelpViewerImplQWE.html</file>
@@ -19270,6 +19317,7 @@
       <file>eric7.JediInterface.JediServer.html</file>
       <file>eric7.JediInterface.RefactoringPreviewDialog.html</file>
       <file>eric7.MicroPython.AddEditDevicesDialog.html</file>
+      <file>eric7.MicroPython.BoardDataDialog.html</file>
       <file>eric7.MicroPython.CircuitPythonDevices.html</file>
       <file>eric7.MicroPython.ConnectionSelectionDialog.html</file>
       <file>eric7.MicroPython.EspBackupRestoreFirmwareDialog.html</file>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpBookmarkPropertiesDialog.html	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,126 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.HelpViewer.HelpBookmarkPropertiesDialog</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.HelpViewer.HelpBookmarkPropertiesDialog</h1>
+
+<p>
+Module implementing a dialog to edit the bookmark properties.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#HelpBookmarkPropertiesDialog">HelpBookmarkPropertiesDialog</a></td>
+<td>Class implementing a dialog to edit the bookmark properties.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="HelpBookmarkPropertiesDialog" ID="HelpBookmarkPropertiesDialog"></a>
+<h2>HelpBookmarkPropertiesDialog</h2>
+
+<p>
+    Class implementing a dialog to edit the bookmark properties.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_HelpBookmarkPropertiesDialog
+<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="#HelpBookmarkPropertiesDialog.__init__">HelpBookmarkPropertiesDialog</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarkPropertiesDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private method to set the enabled state of the OK button.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarkPropertiesDialog.getData">getData</a></td>
+<td>Public method to retrieve the entered data.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="HelpBookmarkPropertiesDialog.__init__" ID="HelpBookmarkPropertiesDialog.__init__"></a>
+<h4>HelpBookmarkPropertiesDialog (Constructor)</h4>
+<b>HelpBookmarkPropertiesDialog</b>(<i>title="", url="", parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>title</i> (str (optional))</dt>
+<dd>
+title for the bookmark (defaults to "")
+</dd>
+<dt><i>url</i> (str (optional))</dt>
+<dd>
+URL for the bookmark (defaults to "")
+</dd>
+<dt><i>parent</i> (QWidget (optional))</dt>
+<dd>
+reference to the parent widget (defaults to None)
+</dd>
+</dl>
+<a NAME="HelpBookmarkPropertiesDialog.__updateOkButton" ID="HelpBookmarkPropertiesDialog.__updateOkButton"></a>
+<h4>HelpBookmarkPropertiesDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+
+<p>
+        Private method to set the enabled state of the OK button.
+</p>
+<a NAME="HelpBookmarkPropertiesDialog.getData" ID="HelpBookmarkPropertiesDialog.getData"></a>
+<h4>HelpBookmarkPropertiesDialog.getData</h4>
+<b>getData</b>(<i></i>)
+
+<p>
+        Public method to retrieve the entered data.
+</p>
+<dl>
+<dt>Return:</dt>
+<dd>
+tuple containing the title and URL for the bookmark
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (str, str)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpBookmarksImportDialog.html	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.HelpViewer.HelpBookmarksImportDialog</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.HelpViewer.HelpBookmarksImportDialog</h1>
+
+<p>
+Module implementing a dialog to enter the bookmarks import parameters.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#HelpBookmarksImportDialog">HelpBookmarksImportDialog</a></td>
+<td>Class implementing a dialog to enter the bookmarks import parameters.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="HelpBookmarksImportDialog" ID="HelpBookmarksImportDialog"></a>
+<h2>HelpBookmarksImportDialog</h2>
+
+<p>
+    Class implementing a dialog to enter the bookmarks import parameters.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_HelpBookmarksImportDialog
+<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="#HelpBookmarksImportDialog.__init__">HelpBookmarksImportDialog</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksImportDialog.__updateOkButton">__updateOkButton</a></td>
+<td>Private method to update the state of the OK button.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksImportDialog.getData">getData</a></td>
+<td>Public method to retrieve the entered data.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="HelpBookmarksImportDialog.__init__" ID="HelpBookmarksImportDialog.__init__"></a>
+<h4>HelpBookmarksImportDialog (Constructor)</h4>
+<b>HelpBookmarksImportDialog</b>(<i>parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>parent</i> (QWidget (optional))</dt>
+<dd>
+reference to the parent widget (defaults to None)
+</dd>
+</dl>
+<a NAME="HelpBookmarksImportDialog.__updateOkButton" ID="HelpBookmarksImportDialog.__updateOkButton"></a>
+<h4>HelpBookmarksImportDialog.__updateOkButton</h4>
+<b>__updateOkButton</b>(<i></i>)
+
+<p>
+        Private method to update the state of the OK button.
+</p>
+<a NAME="HelpBookmarksImportDialog.getData" ID="HelpBookmarksImportDialog.getData"></a>
+<h4>HelpBookmarksImportDialog.getData</h4>
+<b>getData</b>(<i></i>)
+
+<p>
+        Public method to retrieve the entered data.
+</p>
+<dl>
+<dt>Return:</dt>
+<dd>
+tuple containing a flag indicating to replace the existing
+            bookmarks and the path of the bookmarks file to be imported
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+tuple of (bool, str)
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpBookmarksWidget.html	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,369 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.HelpViewer.HelpBookmarksWidget</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.HelpViewer.HelpBookmarksWidget</h1>
+
+<p>
+Module implementing a widget showing the list of bookmarks.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#HelpBookmarksWidget">HelpBookmarksWidget</a></td>
+<td>Class implementing a widget showing the list of bookmarks.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="HelpBookmarksWidget" ID="HelpBookmarksWidget"></a>
+<h2>HelpBookmarksWidget</h2>
+
+<p>
+    Class implementing a widget showing the list of bookmarks.
+</p>
+<h3>Signals</h3>
+<dl>
+
+<dt>escapePressed()</dt>
+<dd>
+emitted when the ESC key was pressed
+</dd>
+<dt>newBackgroundTab(QUrl, str)</dt>
+<dd>
+emitted to open an entry in a
+        new background tab
+</dd>
+<dt>newTab(QUrl, str)</dt>
+<dd>
+emitted to open an entry in a new tab
+</dd>
+<dt>openUrl(QUrl, str)</dt>
+<dd>
+emitted to open an entry in the current tab
+</dd>
+</dl>
+<h3>Derived from</h3>
+QListWidget
+<h3>Class Attributes</h3>
+
+<table>
+<tr><td>UrlRole</td></tr>
+</table>
+<h3>Class Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Methods</h3>
+
+<table>
+
+<tr>
+<td><a href="#HelpBookmarksWidget.__init__">HelpBookmarksWidget</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__addBookmark">__addBookmark</a></td>
+<td>Private slot to add a bookmark entry.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__bookmarkActivated">__bookmarkActivated</a></td>
+<td>Private slot handling the activation of a bookmark.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__bookmarkCurrentPage">__bookmarkCurrentPage</a></td>
+<td>Private slot to bookmark the current page.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__deleteBookmarks">__deleteBookmarks</a></td>
+<td>Private method to delete the given bookmark items.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__editBookmark">__editBookmark</a></td>
+<td>Private slot to edit a bookmark.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__exportBookmarks">__exportBookmarks</a></td>
+<td>Private slot to export the bookmarks into a JSON file.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__importBookmarks">__importBookmarks</a></td>
+<td>Private slot to import bookmarks from a JSON file.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__loadBookmarks">__loadBookmarks</a></td>
+<td>Private method to load the defined bookmarks.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__newBookmark">__newBookmark</a></td>
+<td>Private slot to create a new bookmark.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__openBookmarks">__openBookmarks</a></td>
+<td>Private method to open all or selected bookmarks.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__saveBookmarks">__saveBookmarks</a></td>
+<td>Private method to save the defined bookmarks.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__showBackgroundMenu">__showBackgroundMenu</a></td>
+<td>Private slot to show the background menu (i.e.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__showBookmarkContextMenu">__showBookmarkContextMenu</a></td>
+<td>Private slot to show the context menu for a bookmark.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__showBookmarksContextMenu">__showBookmarksContextMenu</a></td>
+<td>Private slot to show the context menu for multiple bookmark.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.__showContextMenu">__showContextMenu</a></td>
+<td>Private slot to handle the customContextMenuRequested signal of the viewlist.</td>
+</tr>
+<tr>
+<td><a href="#HelpBookmarksWidget.addBookmark">addBookmark</a></td>
+<td>Public slot to add a bookmark with given data.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="HelpBookmarksWidget.__init__" ID="HelpBookmarksWidget.__init__"></a>
+<h4>HelpBookmarksWidget (Constructor)</h4>
+<b>HelpBookmarksWidget</b>(<i>parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>parent</i> (QWidget (optional))</dt>
+<dd>
+reference to the parent widget (defaults to None)
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__addBookmark" ID="HelpBookmarksWidget.__addBookmark"></a>
+<h4>HelpBookmarksWidget.__addBookmark</h4>
+<b>__addBookmark</b>(<i>title, url</i>)
+
+<p>
+        Private slot to add a bookmark entry.
+</p>
+<dl>
+
+<dt><i>title</i> (str)</dt>
+<dd>
+title for the bookmark
+</dd>
+<dt><i>url</i> (str)</dt>
+<dd>
+URL for the bookmark
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__bookmarkActivated" ID="HelpBookmarksWidget.__bookmarkActivated"></a>
+<h4>HelpBookmarksWidget.__bookmarkActivated</h4>
+<b>__bookmarkActivated</b>(<i>itm</i>)
+
+<p>
+        Private slot handling the activation of a bookmark.
+</p>
+<dl>
+
+<dt><i>itm</i> (QListWidgetItem)</dt>
+<dd>
+reference to the activated item
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__bookmarkCurrentPage" ID="HelpBookmarksWidget.__bookmarkCurrentPage"></a>
+<h4>HelpBookmarksWidget.__bookmarkCurrentPage</h4>
+<b>__bookmarkCurrentPage</b>(<i></i>)
+
+<p>
+        Private slot to bookmark the current page.
+</p>
+<a NAME="HelpBookmarksWidget.__deleteBookmarks" ID="HelpBookmarksWidget.__deleteBookmarks"></a>
+<h4>HelpBookmarksWidget.__deleteBookmarks</h4>
+<b>__deleteBookmarks</b>(<i>items</i>)
+
+<p>
+        Private method to delete the given bookmark items.
+</p>
+<dl>
+
+<dt><i>items</i> (list of QListWidgetItem)</dt>
+<dd>
+list of bookmarks to be deleted
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__editBookmark" ID="HelpBookmarksWidget.__editBookmark"></a>
+<h4>HelpBookmarksWidget.__editBookmark</h4>
+<b>__editBookmark</b>(<i>itm</i>)
+
+<p>
+        Private slot to edit a bookmark.
+</p>
+<dl>
+
+<dt><i>itm</i> (QListWidgetItem)</dt>
+<dd>
+reference to the bookmark item to be edited
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__exportBookmarks" ID="HelpBookmarksWidget.__exportBookmarks"></a>
+<h4>HelpBookmarksWidget.__exportBookmarks</h4>
+<b>__exportBookmarks</b>(<i>selected=False</i>)
+
+<p>
+        Private slot to export the bookmarks into a JSON file.
+</p>
+<dl>
+
+<dt><i>selected</i> (bool (optional))</dt>
+<dd>
+flag indicating to export the selected bookmarks
+            (defaults to False)
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__importBookmarks" ID="HelpBookmarksWidget.__importBookmarks"></a>
+<h4>HelpBookmarksWidget.__importBookmarks</h4>
+<b>__importBookmarks</b>(<i></i>)
+
+<p>
+        Private slot to import bookmarks from a JSON file.
+</p>
+<a NAME="HelpBookmarksWidget.__loadBookmarks" ID="HelpBookmarksWidget.__loadBookmarks"></a>
+<h4>HelpBookmarksWidget.__loadBookmarks</h4>
+<b>__loadBookmarks</b>(<i></i>)
+
+<p>
+        Private method to load the defined bookmarks.
+</p>
+<a NAME="HelpBookmarksWidget.__newBookmark" ID="HelpBookmarksWidget.__newBookmark"></a>
+<h4>HelpBookmarksWidget.__newBookmark</h4>
+<b>__newBookmark</b>(<i></i>)
+
+<p>
+        Private slot to create a new bookmark.
+</p>
+<a NAME="HelpBookmarksWidget.__openBookmarks" ID="HelpBookmarksWidget.__openBookmarks"></a>
+<h4>HelpBookmarksWidget.__openBookmarks</h4>
+<b>__openBookmarks</b>(<i>selected=False</i>)
+
+<p>
+        Private method to open all or selected bookmarks.
+</p>
+<dl>
+
+<dt><i>selected</i> (bool (optional))</dt>
+<dd>
+flag indicating to open the selected bookmarks
+            (defaults to False)
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__saveBookmarks" ID="HelpBookmarksWidget.__saveBookmarks"></a>
+<h4>HelpBookmarksWidget.__saveBookmarks</h4>
+<b>__saveBookmarks</b>(<i></i>)
+
+<p>
+        Private method to save the defined bookmarks.
+</p>
+<a NAME="HelpBookmarksWidget.__showBackgroundMenu" ID="HelpBookmarksWidget.__showBackgroundMenu"></a>
+<h4>HelpBookmarksWidget.__showBackgroundMenu</h4>
+<b>__showBackgroundMenu</b>(<i>point</i>)
+
+<p>
+        Private slot to show the background menu (i.e. no selection).
+</p>
+<dl>
+
+<dt><i>point</i> (QPoint)</dt>
+<dd>
+position to open the menu at
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__showBookmarkContextMenu" ID="HelpBookmarksWidget.__showBookmarkContextMenu"></a>
+<h4>HelpBookmarksWidget.__showBookmarkContextMenu</h4>
+<b>__showBookmarkContextMenu</b>(<i>point</i>)
+
+<p>
+        Private slot to show the context menu for a bookmark.
+</p>
+<dl>
+
+<dt><i>point</i> (QPoint)</dt>
+<dd>
+position to open the menu at
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__showBookmarksContextMenu" ID="HelpBookmarksWidget.__showBookmarksContextMenu"></a>
+<h4>HelpBookmarksWidget.__showBookmarksContextMenu</h4>
+<b>__showBookmarksContextMenu</b>(<i>point</i>)
+
+<p>
+        Private slot to show the context menu for multiple bookmark.
+</p>
+<dl>
+
+<dt><i>point</i> (QPoint)</dt>
+<dd>
+position to open the menu at
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.__showContextMenu" ID="HelpBookmarksWidget.__showContextMenu"></a>
+<h4>HelpBookmarksWidget.__showContextMenu</h4>
+<b>__showContextMenu</b>(<i>point</i>)
+
+<p>
+        Private slot to handle the customContextMenuRequested signal of
+        the viewlist.
+</p>
+<dl>
+
+<dt><i>point</i> (QPoint)</dt>
+<dd>
+position to open the menu at
+</dd>
+</dl>
+<a NAME="HelpBookmarksWidget.addBookmark" ID="HelpBookmarksWidget.addBookmark"></a>
+<h4>HelpBookmarksWidget.addBookmark</h4>
+<b>addBookmark</b>(<i>title, url</i>)
+
+<p>
+        Public slot to add a bookmark with given data.
+</p>
+<dl>
+
+<dt><i>title</i> (str)</dt>
+<dd>
+title for the bookmark
+</dd>
+<dt><i>url</i> (QUrl)</dt>
+<dd>
+URL for the bookmark
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerImplQTB.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerImplQTB.html	Tue Feb 08 14:15:48 2022 +0100
@@ -59,6 +59,10 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#HelpViewerImplQTB.__bookmarkPage">__bookmarkPage</a></td>
+<td>Private method called by the context menu to bookmark the page.</td>
+</tr>
+<tr>
 <td><a href="#HelpViewerImplQTB.__canLoadResource">__canLoadResource</a></td>
 <td>Private method to check, if the given resource can be loaded.</td>
 </tr>
@@ -203,6 +207,20 @@
 reference to the parent widget
 </dd>
 </dl>
+<a NAME="HelpViewerImplQTB.__bookmarkPage" ID="HelpViewerImplQTB.__bookmarkPage"></a>
+<h4>HelpViewerImplQTB.__bookmarkPage</h4>
+<b>__bookmarkPage</b>(<i>act</i>)
+
+<p>
+        Private method called by the context menu to bookmark the page.
+</p>
+<dl>
+
+<dt><i>act</i> (QAction)</dt>
+<dd>
+reference to the action that triggered
+</dd>
+</dl>
 <a NAME="HelpViewerImplQTB.__canLoadResource" ID="HelpViewerImplQTB.__canLoadResource"></a>
 <h4>HelpViewerImplQTB.__canLoadResource</h4>
 <b>__canLoadResource</b>(<i>url</i>)

--- a/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerImplQWE.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerImplQWE.html	Tue Feb 08 14:15:48 2022 +0100
@@ -59,6 +59,10 @@
 <td>Constructor</td>
 </tr>
 <tr>
+<td><a href="#HelpViewerImplQWE.__bookmarkPage">__bookmarkPage</a></td>
+<td>Private method called by the context menu to bookmark the page.</td>
+</tr>
+<tr>
 <td><a href="#HelpViewerImplQWE.__closeOtherPages">__closeOtherPages</a></td>
 <td>Private method called by the context menu to close all other pages.</td>
 </tr>
@@ -255,6 +259,20 @@
 reference to the parent widget
 </dd>
 </dl>
+<a NAME="HelpViewerImplQWE.__bookmarkPage" ID="HelpViewerImplQWE.__bookmarkPage"></a>
+<h4>HelpViewerImplQWE.__bookmarkPage</h4>
+<b>__bookmarkPage</b>(<i>act</i>)
+
+<p>
+        Private method called by the context menu to bookmark the page.
+</p>
+<dl>
+
+<dt><i>act</i> (QAction)</dt>
+<dd>
+reference to the action that triggered
+</dd>
+</dl>
 <a NAME="HelpViewerImplQWE.__closeOtherPages" ID="HelpViewerImplQWE.__closeOtherPages"></a>
 <h4>HelpViewerImplQWE.__closeOtherPages</h4>
 <b>__closeOtherPages</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerWidget.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.HelpViewer.HelpViewerWidget.html	Tue Feb 08 14:15:48 2022 +0100
@@ -231,6 +231,10 @@
 <td>Public method to add a new help page with the given URL.</td>
 </tr>
 <tr>
+<td><a href="#HelpViewerWidget.bookmarkPage">bookmarkPage</a></td>
+<td>Public method to bookmark a page with the given data.</td>
+</tr>
+<tr>
 <td><a href="#HelpViewerWidget.closeAllPages">closeAllPages</a></td>
 <td>Public slot to close all pages.</td>
 </tr>
@@ -770,6 +774,24 @@
 HelpViewerImpl
 </dd>
 </dl>
+<a NAME="HelpViewerWidget.bookmarkPage" ID="HelpViewerWidget.bookmarkPage"></a>
+<h4>HelpViewerWidget.bookmarkPage</h4>
+<b>bookmarkPage</b>(<i>title, url</i>)
+
+<p>
+        Public method to bookmark a page with the given data.
+</p>
+<dl>
+
+<dt><i>title</i> (str)</dt>
+<dd>
+title of the page
+</dd>
+<dt><i>url</i> (QUrl)</dt>
+<dd>
+URL of the page
+</dd>
+</dl>
 <a NAME="HelpViewerWidget.closeAllPages" ID="HelpViewerWidget.closeAllPages"></a>
 <h4>HelpViewerWidget.closeAllPages</h4>
 <b>closeAllPages</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.HelpViewer.OpenPagesWidget.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.HelpViewer.OpenPagesWidget.html	Tue Feb 08 14:15:48 2022 +0100
@@ -41,14 +41,14 @@
 <h3>Signals</h3>
 <dl>
 
-<dt>currentChanged(index)</dt>
+<dt>currentPageChanged(index)</dt>
 <dd>
 emitted to signal a change of the current
         page index
 </dd>
 </dl>
 <h3>Derived from</h3>
-QWidget
+QListWidget
 <h3>Class Attributes</h3>
 
 <table>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/Documentation/Source/eric7.MicroPython.BoardDataDialog.html	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,118 @@
+<!DOCTYPE html>
+<html><head>
+<title>eric7.MicroPython.BoardDataDialog</title>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="styles.css">
+</head>
+<body>
+<a NAME="top" ID="top"></a>
+<h1>eric7.MicroPython.BoardDataDialog</h1>
+
+<p>
+Module implementing a dialog to show information about a connected board.
+</p>
+<h3>Global Attributes</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<h3>Classes</h3>
+
+<table>
+
+<tr>
+<td><a href="#BoardDataDialog">BoardDataDialog</a></td>
+<td>Class implementing a dialog to show information about a connected board.</td>
+</tr>
+</table>
+<h3>Functions</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+<hr />
+<hr />
+<a NAME="BoardDataDialog" ID="BoardDataDialog"></a>
+<h2>BoardDataDialog</h2>
+
+<p>
+    Class implementing a dialog to show information about a connected board.
+</p>
+<h3>Derived from</h3>
+QDialog, Ui_BoardDataDialog
+<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="#BoardDataDialog.__init__">BoardDataDialog</a></td>
+<td>Constructor</td>
+</tr>
+<tr>
+<td><a href="#BoardDataDialog.__createHeader">__createHeader</a></td>
+<td>Private method to create a header item.</td>
+</tr>
+</table>
+<h3>Static Methods</h3>
+
+<table>
+<tr><td>None</td></tr>
+</table>
+
+<a NAME="BoardDataDialog.__init__" ID="BoardDataDialog.__init__"></a>
+<h4>BoardDataDialog (Constructor)</h4>
+<b>BoardDataDialog</b>(<i>data, parent=None</i>)
+
+<p>
+        Constructor
+</p>
+<dl>
+
+<dt><i>data</i> (dict)</dt>
+<dd>
+dictionary containing the data to be shown
+</dd>
+<dt><i>parent</i> (QWidget (optional))</dt>
+<dd>
+reference to the parent widget (defaults to None)
+</dd>
+</dl>
+<a NAME="BoardDataDialog.__createHeader" ID="BoardDataDialog.__createHeader"></a>
+<h4>BoardDataDialog.__createHeader</h4>
+<b>__createHeader</b>(<i>headerText</i>)
+
+<p>
+        Private method to create a header item.
+</p>
+<dl>
+
+<dt><i>headerText</i> (str)</dt>
+<dd>
+text for the header item
+</dd>
+</dl>
+<dl>
+<dt>Return:</dt>
+<dd>
+reference to the created header item
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+QTreeWidgetItem
+</dd>
+</dl>
+<div align="right"><a href="#top">Up</a></div>
+<hr />
+</body></html>
\ No newline at end of file

--- a/eric7/Documentation/Source/eric7.MicroPython.EspBackupRestoreFirmwareDialog.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.MicroPython.EspBackupRestoreFirmwareDialog.html	Tue Feb 08 14:15:48 2022 +0100
@@ -45,7 +45,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<tr><td>FlashModes</td></tr><tr><td>FlashSizes</td></tr>
+<tr><td>Chips</td></tr><tr><td>FlashModes</td></tr><tr><td>FlashSizes</td></tr>
 </table>
 <h3>Class Methods</h3>
 

--- a/eric7/Documentation/Source/eric7.MicroPython.EspDevices.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.MicroPython.EspDevices.html	Tue Feb 08 14:15:48 2022 +0100
@@ -204,13 +204,6 @@
 <p>
         Private slot to flash a MicroPython firmware to the device.
 </p>
-<dl>
-
-<dt>Raises <b>ValueError</b>:</dt>
-<dd>
-raised to indicate an unsupported chip type
-</dd>
-</dl>
 <a NAME="EspDevice.__installEspTool" ID="EspDevice.__installEspTool"></a>
 <h4>EspDevice.__installEspTool</h4>
 <b>__installEspTool</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.MicroPython.EspFirmwareSelectionDialog.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.MicroPython.EspFirmwareSelectionDialog.html	Tue Feb 08 14:15:48 2022 +0100
@@ -45,7 +45,7 @@
 <h3>Class Attributes</h3>
 
 <table>
-<tr><td>FlashModes</td></tr>
+<tr><td>Chips</td></tr><tr><td>FlashAddresses</td></tr><tr><td>FlashModes</td></tr>
 </table>
 <h3>Class Methods</h3>
 

--- a/eric7/Documentation/Source/eric7.MicroPython.MicroPythonCommandsInterface.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.MicroPython.MicroPythonCommandsInterface.html	Tue Feb 08 14:15:48 2022 +0100
@@ -142,6 +142,10 @@
 <td>Public method to copy a file from the connected device.</td>
 </tr>
 <tr>
+<td><a href="#MicroPythonCommandsInterface.getBoardInformation">getBoardInformation</a></td>
+<td>Public method to get some information data of the connected board.</td>
+</tr>
+<tr>
 <td><a href="#MicroPythonCommandsInterface.getImplementation">getImplementation</a></td>
 <td>Public method to get some implementation information of the connected device.</td>
 </tr>
@@ -448,6 +452,32 @@
 raised to indicate an issue with the device
 </dd>
 </dl>
+<a NAME="MicroPythonCommandsInterface.getBoardInformation" ID="MicroPythonCommandsInterface.getBoardInformation"></a>
+<h4>MicroPythonCommandsInterface.getBoardInformation</h4>
+<b>getBoardInformation</b>(<i></i>)
+
+<p>
+        Public method to get some information data of the connected board.
+</p>
+<dl>
+<dt>Return:</dt>
+<dd>
+dictionary containing the determined data
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+dict
+</dd>
+</dl>
+<dl>
+
+<dt>Raises <b>OSError</b>:</dt>
+<dd>
+raised to indicate an issue with the device
+</dd>
+</dl>
 <a NAME="MicroPythonCommandsInterface.getImplementation" ID="MicroPythonCommandsInterface.getImplementation"></a>
 <h4>MicroPythonCommandsInterface.getImplementation</h4>
 <b>getImplementation</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.MicroPython.MicroPythonWidget.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.MicroPython.MicroPythonWidget.html	Tue Feb 08 14:15:48 2022 +0100
@@ -164,6 +164,10 @@
 <td>Private method to set the connection status LED.</td>
 </tr>
 <tr>
+<td><a href="#MicroPythonWidget.__showBoardInformation">__showBoardInformation</a></td>
+<td>Private slot to show all available information about a board.</td>
+</tr>
+<tr>
 <td><a href="#MicroPythonWidget.__showContextMenu">__showContextMenu</a></td>
 <td>Private slot to show the REPL context menu.</td>
 </tr>
@@ -621,6 +625,13 @@
 connection state
 </dd>
 </dl>
+<a NAME="MicroPythonWidget.__showBoardInformation" ID="MicroPythonWidget.__showBoardInformation"></a>
+<h4>MicroPythonWidget.__showBoardInformation</h4>
+<b>__showBoardInformation</b>(<i></i>)
+
+<p>
+        Private slot to show all available information about a board.
+</p>
 <a NAME="MicroPythonWidget.__showContextMenu" ID="MicroPythonWidget.__showContextMenu"></a>
 <h4>MicroPythonWidget.__showContextMenu</h4>
 <b>__showContextMenu</b>(<i>pos</i>)

--- a/eric7/Documentation/Source/eric7.Project.ProjectOthersBrowser.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.Project.ProjectOthersBrowser.html	Tue Feb 08 14:15:48 2022 +0100
@@ -110,6 +110,10 @@
 <td>Protected slot to handle the open in icon editor popup menu entry.</td>
 </tr>
 <tr>
+<td><a href="#ProjectOthersBrowser._openFileInEditor">_openFileInEditor</a></td>
+<td>Protected slot to handle the Open in Editor menu action.</td>
+</tr>
+<tr>
 <td><a href="#ProjectOthersBrowser._openHexEditor">_openHexEditor</a></td>
 <td>Protected slot to handle the open in hex editor popup menu entry.</td>
 </tr>
@@ -225,6 +229,13 @@
 <p>
         Protected slot to handle the open in icon editor popup menu entry.
 </p>
+<a NAME="ProjectOthersBrowser._openFileInEditor" ID="ProjectOthersBrowser._openFileInEditor"></a>
+<h4>ProjectOthersBrowser._openFileInEditor</h4>
+<b>_openFileInEditor</b>(<i></i>)
+
+<p>
+        Protected slot to handle the Open in Editor menu action.
+</p>
 <a NAME="ProjectOthersBrowser._openHexEditor" ID="ProjectOthersBrowser._openHexEditor"></a>
 <h4>ProjectOthersBrowser._openHexEditor</h4>
 <b>_openHexEditor</b>(<i></i>)

--- a/eric7/Documentation/Source/eric7.UI.Browser.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/eric7.UI.Browser.html	Tue Feb 08 14:15:48 2022 +0100
@@ -225,6 +225,10 @@
 <td>Protected slot to create a new file.</td>
 </tr>
 <tr>
+<td><a href="#Browser._openFileInEditor">_openFileInEditor</a></td>
+<td>Protected slot to handle the Open in Editor menu action.</td>
+</tr>
+<tr>
 <td><a href="#Browser._openHexEditor">_openHexEditor</a></td>
 <td>Protected slot to handle the open in hex editor popup menu entry.</td>
 </tr>
@@ -516,6 +520,13 @@
 <p>
         Protected slot to create a new file.
 </p>
+<a NAME="Browser._openFileInEditor" ID="Browser._openFileInEditor"></a>
+<h4>Browser._openFileInEditor</h4>
+<b>_openFileInEditor</b>(<i></i>)
+
+<p>
+        Protected slot to handle the Open in Editor menu action.
+</p>
 <a NAME="Browser._openHexEditor" ID="Browser._openHexEditor"></a>
 <h4>Browser._openHexEditor</h4>
 <b>_openHexEditor</b>(<i></i>)

--- a/eric7/Documentation/Source/index-eric7.HelpViewer.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/index-eric7.HelpViewer.html	Tue Feb 08 14:15:48 2022 +0100
@@ -16,6 +16,18 @@
 <table>
 
 <tr>
+<td><a href="eric7.HelpViewer.HelpBookmarkPropertiesDialog.html">HelpBookmarkPropertiesDialog</a></td>
+<td>Module implementing a dialog to edit the bookmark properties.</td>
+</tr>
+<tr>
+<td><a href="eric7.HelpViewer.HelpBookmarksImportDialog.html">HelpBookmarksImportDialog</a></td>
+<td>Module implementing a dialog to enter the bookmarks import parameters.</td>
+</tr>
+<tr>
+<td><a href="eric7.HelpViewer.HelpBookmarksWidget.html">HelpBookmarksWidget</a></td>
+<td>Module implementing a widget showing the list of bookmarks.</td>
+</tr>
+<tr>
 <td><a href="eric7.HelpViewer.HelpViewerImpl.html">HelpViewerImpl</a></td>
 <td>Module implementing the help viewer base class.</td>
 </tr>

--- a/eric7/Documentation/Source/index-eric7.MicroPython.html	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/Documentation/Source/index-eric7.MicroPython.html	Tue Feb 08 14:15:48 2022 +0100
@@ -20,6 +20,10 @@
 <td>Module implementing a dialog to add or edit data of unknown MicroPython devices.</td>
 </tr>
 <tr>
+<td><a href="eric7.MicroPython.BoardDataDialog.html">BoardDataDialog</a></td>
+<td>Module implementing a dialog to show information about a connected board.</td>
+</tr>
+<tr>
 <td><a href="eric7.MicroPython.CircuitPythonDevices.html">CircuitPythonDevices</a></td>
 <td>Module implementing the device interface class for CircuitPython boards.</td>
 </tr>

--- a/eric7/EricNetwork/EricJsonServer.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/EricNetwork/EricJsonServer.py	Tue Feb 08 14:15:48 2022 +0100
@@ -12,7 +12,7 @@
 
 from PyQt6.QtCore import (
     pyqtSlot, QProcess, QProcessEnvironment, QCoreApplication, QEventLoop,
-    QTimer
+    QTimer, QThread
 )
 from PyQt6.QtNetwork import QTcpServer, QHostAddress
 
@@ -255,6 +255,7 @@
                     # connection of the client (= slow start).
                     QCoreApplication.processEvents(
                         QEventLoop.ProcessEventsFlag.ExcludeUserInputEvents)
+                    QThread.msleep(100)
                     
                     # check if client exited prematurely
                     if proc.state() == QProcess.ProcessState.NotRunning:
@@ -262,6 +263,8 @@
                         proc = None
                         self.__clientProcesses[idString] = None
                         break
+                    
+                    QThread.msleep(500)
         else:
             if proc:
                 timer = QTimer()

--- a/eric7/EricWidgets/EricApplication.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/EricWidgets/EricApplication.py	Tue Feb 08 14:15:48 2022 +0100
@@ -220,7 +220,7 @@
                     styleSheet = f.read()
             except OSError as msg:
                 EricMessageBox.warning(
-                    self,
+                    None,
                     QCoreApplication.translate(
                         "EricApplication", "Loading Style Sheet"),
                     QCoreApplication.translate(

--- a/eric7/EricWidgets/EricSpellCheckedTextEdit.py	Tue Jan 04 15:38:11 2022 +0100
+++ b/eric7/EricWidgets/EricSpellCheckedTextEdit.py	Tue Feb 08 14:15:48 2022 +0100
@@ -55,13 +55,19 @@
                     SpellCheckMixin.DefaultUserExceptionList
                 )
             except DictNotFoundError:
-                # Use English dictionary if no locale dictionary is available
-                # or the default one could not be found.
-                spellDict = enchant.DictWithPWL(
-                    "en",
-                    SpellCheckMixin.DefaultUserWordList,
-                    SpellCheckMixin.DefaultUserExceptionList
-                )
+                try:
+                    # Use English dictionary if no locale dictionary is
+                    # available or the default one could not be found.
+                    spellDict = enchant.DictWithPWL(
+                        "en",
+                        SpellCheckMixin.DefaultUserWordList,
+                        SpellCheckMixin.DefaultUserExceptionList
+                    )
+                except DictNotFoundError:
+                    # Still no dictionary could be found. Forget about spell
+                    # checking.
+                    spellDict = None
+            
             self.__highlighter.setDict(spellDict)
         
         def contextMenuEvent(self, evt):
@@ -452,6 +458,7 @@
             QSyntaxHighlighter.__init__(self, *args)
             
             self.__spellDict = None
+            self.__tokenizer = None
             self.__chunkers = []
         
         def chunkers(self):
@@ -489,17 +496,21 @@
             @param spellDict spelling dictionary
             @type enchant.Dict
             """
-            try:
-                self.__tokenizer = enchant.tokenize.get_tokenizer(
-                    spellDict.tag,
-                    chunkers=self.__chunkers,
-                    filters=EnchantHighlighter.TokenFilters)
-            except TokenizerNotFoundError:
-                # Fall back to the "good for most euro languages"
-                # English tokenizer
-                self.__tokenizer = enchant.tokenize.get_tokenizer(
-                    chunkers=self.__chunkers,
-                    filters=EnchantHighlighter.TokenFilters)
+            if spellDict:
+                try:
+                    self.__tokenizer = enchant.tokenize.get_tokenizer(
+                        spellDict.tag,
+                        chunkers=self.__chunkers,
+                        filters=EnchantHighlighter.TokenFilters)
+                except TokenizerNotFoundError:
+                    # Fall back to the "good for most euro languages"
+                    # English tokenizer
+                    self.__tokenizer = enchant.tokenize.get_tokenizer(
+                        chunkers=self.__chunkers,
+                        filters=EnchantHighlighter.TokenFilters)
+            else:
+                self.__tokenizer = None
+            
             self.__spellDict = spellDict
             
             self.rehighlight()
@@ -512,7 +523,7 @@
             @type str
             """
             """Overridden QSyntaxHighlighter method to apply the highlight"""
-            if not self.__spellDict:
+            if self.__spellDict is None or self.__tokenizer is None:
                 return
             
             # Build a list of all misspelled words and highlight them

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/HelpViewer/HelpBookmarkPropertiesDialog.py	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to edit the bookmark properties.
+"""
+
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+
+from .Ui_HelpBookmarkPropertiesDialog import Ui_HelpBookmarkPropertiesDialog
+
+
+class HelpBookmarkPropertiesDialog(QDialog, Ui_HelpBookmarkPropertiesDialog):
+    """
+    Class implementing a dialog to edit the bookmark properties.
+    """
+    def __init__(self, title="", url="", parent=None):
+        """
+        Constructor
+        
+        @param title title for the bookmark (defaults to "")
+        @type str (optional)
+        @param url URL for the bookmark (defaults to "")
+        @type str (optional)
+        @param parent reference to the parent widget (defaults to None)
+        @type QWidget (optional)
+        """
+        super().__init__(parent)
+        self.setupUi(self)
+        
+        self.titleEdit.textChanged.connect(self.__updateOkButton)
+        self.urlEdit.textChanged.connect(self.__updateOkButton)
+        
+        self.titleEdit.setText(title)
+        self.urlEdit.setText(url)
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
+    
+    @pyqtSlot()
+    def __updateOkButton(self):
+        """
+        Private method to set the enabled state of the OK button.
+        """
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(
+            bool(self.titleEdit.text().strip()) and
+            bool(self.urlEdit.text().strip())
+        )
+    
+    def getData(self):
+        """
+        Public method to retrieve the entered data.
+        
+        @return tuple containing the title and URL for the bookmark
+        @rtype tuple of (str, str)
+        """
+        return (
+            self.titleEdit.text().strip(),
+            self.urlEdit.text().strip(),
+        )

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/HelpViewer/HelpBookmarkPropertiesDialog.ui	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpBookmarkPropertiesDialog</class>
+ <widget class="QDialog" name="HelpBookmarkPropertiesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>108</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Bookmark</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Title:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="titleEdit">
+     <property name="toolTip">
+      <string>Enter the title for the bookmark</string>
+     </property>
+     <property name="placeholderText">
+      <string>Enter Bookmark Title</string>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>URL:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="urlEdit">
+     <property name="toolTip">
+      <string>Enter the URL for the bookmark</string>
+     </property>
+     <property name="placeholderText">
+      <string>Enter Bookmark URL</string>
+     </property>
+     <property name="clearButtonEnabled">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>HelpBookmarkPropertiesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>HelpBookmarkPropertiesDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/HelpViewer/HelpBookmarksImportDialog.py	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a dialog to enter the bookmarks import parameters.
+"""
+
+from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+
+from EricWidgets.EricPathPicker import EricPathPickerModes
+
+from .Ui_HelpBookmarksImportDialog import Ui_HelpBookmarksImportDialog
+
+
+class HelpBookmarksImportDialog(QDialog, Ui_HelpBookmarksImportDialog):
+    """
+    Class implementing a dialog to enter the bookmarks import parameters.
+    """
+    def __init__(self, parent=None):
+        """
+        Constructor
+        
+        @param parent reference to the parent widget (defaults to None)
+        @type QWidget (optional)
+        """
+        super().__init__(parent)
+        self.setupUi(self)
+        
+        self.bookmarksPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
+        self.bookmarksPicker.setFilters(
+            self.tr("eric Bookmarks Files (*.json);;All Files (*)"))
+        self.bookmarksPicker.textChanged.connect(self.__updateOkButton)
+        
+        msh = self.minimumSizeHint()
+        self.resize(max(self.width(), msh.width()), msh.height())
+        
+        self.__updateOkButton()
+    
+    @pyqtSlot()
+    def __updateOkButton(self):
+        """
+        Private method to update the state of the OK button.
+        """
+        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setEnabled(
+            bool(self.bookmarksPicker.text()))
+    
+    def getData(self):
+        """
+        Public method to retrieve the entered data.
+        
+        @return tuple containing a flag indicating to replace the existing
+            bookmarks and the path of the bookmarks file to be imported
+        @rtype tuple of (bool, str)
+        """
+        return (
+            self.replaceCheckBox.isChecked(),
+            self.bookmarksPicker.path(),
+        )

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/HelpViewer/HelpBookmarksImportDialog.ui	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpBookmarksImportDialog</class>
+ <widget class="QDialog" name="HelpBookmarksImportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>500</width>
+    <height>98</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Import Bookmarks</string>
+  </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="replaceCheckBox">
+     <property name="toolTip">
+      <string>Select to replace the existing bookmarks</string>
+     </property>
+     <property name="text">
+      <string>Replace Existing Bookmarks</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Bookmarks:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="EricPathPicker" name="bookmarksPicker" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::WheelFocus</enum>
+     </property>
+     <property name="toolTip">
+      <string>Enter the path of the bookmarks file</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>EricPathPicker</class>
+   <extends>QWidget</extends>
+   <header>EricWidgets/EricPathPicker.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>HelpBookmarksImportDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>HelpBookmarksImportDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/eric7/HelpViewer/HelpBookmarksWidget.py	Tue Feb 08 14:15:48 2022 +0100
@@ -0,0 +1,534 @@
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+#
+
+"""
+Module implementing a widget showing the list of bookmarks.
+"""
+
+import contextlib
+import datetime
+import json
+import os
+
+from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QUrl
+from PyQt6.QtGui import QClipboard, QGuiApplication
+from PyQt6.QtWidgets import (
+    QAbstractItemView, QApplication, QDialog, QListWidget, QListWidgetItem,
+    QMenu
+)
+
+from EricWidgets import EricFileDialog, EricMessageBox
+
+import Preferences
+
+from .HelpBookmarkPropertiesDialog import HelpBookmarkPropertiesDialog
+
+
+class HelpBookmarksWidget(QListWidget):
+    """
+    Class implementing a widget showing the list of bookmarks.
+    
+    @signal escapePressed() emitted when the ESC key was pressed
+    @signal openUrl(QUrl, str) emitted to open an entry in the current tab
+    @signal newTab(QUrl, str) emitted to open an entry in a new tab
+    @signal newBackgroundTab(QUrl, str) emitted to open an entry in a
+        new background tab
+    """
+    escapePressed = pyqtSignal()
+    openUrl = pyqtSignal(QUrl)
+    newTab = pyqtSignal(QUrl)
+    newBackgroundTab = pyqtSignal(QUrl)
+    
+    UrlRole = Qt.ItemDataRole.UserRole + 1
+    
+    def __init__(self, parent=None):
+        """
+        Constructor
+        
+        @param parent reference to the parent widget (defaults to None)
+        @type QWidget (optional)
+        """
+        super().__init__(parent)
+        self.setObjectName("HelpBookmarksWidget")
+        
+        self.__helpViewer = parent
+        
+        self.setAlternatingRowColors(True)
+        self.setSelectionMode(
+            QAbstractItemView.SelectionMode.ExtendedSelection)
+        self.setSortingEnabled(True)
+        
+        self.setContextMenuPolicy(
+            Qt.ContextMenuPolicy.CustomContextMenu)
+        self.customContextMenuRequested.connect(
+            self.__showContextMenu)
+        
+        self.__bookmarks = []
+        self.__loadBookmarks()
+        
+        self.itemDoubleClicked.connect(self.__bookmarkActivated)
+    
+    @pyqtSlot(QPoint)
+    def __showContextMenu(self, point):
+        """
+        Private slot to handle the customContextMenuRequested signal of
+        the viewlist.
+        
+        @param point position to open the menu at
+        @type QPoint
+        """
+        selectedItemsCount = len(self.selectedItems())
+        if selectedItemsCount == 0:
+            # background menu
+            self.__showBackgroundMenu(point)
+        elif selectedItemsCount == 1:
+            # single bookmark menu
+            self.__showBookmarkContextMenu(point)
+        else:
+            # multiple selected bookmarks
+            self.__showBookmarksContextMenu(point)
+    
+    @pyqtSlot(QPoint)
+    def __showBackgroundMenu(self, point):
+        """
+        Private slot to show the background menu (i.e. no selection).
+        
+        @param point position to open the menu at
+        @type QPoint
+        """
+        menu = QMenu()
+        openBookmarks = menu.addAction(self.tr("Open All Bookmarks"))
+        menu.addSeparator()
+        newBookmark = menu.addAction(self.tr("New Bookmark"))
+        addBookmark = menu.addAction(self.tr("Bookmark Page"))
+        menu.addSeparator()
+        deleteBookmarks = menu.addAction(self.tr("Delete All Bookmarks"))
+        menu.addSeparator()
+        exportBookmarks = menu.addAction(self.tr("Export All Bookmarks"))
+        importBookmarks = menu.addAction(self.tr("Import Bookmarks"))
+        
+        act = menu.exec(self.mapToGlobal(point))
+        if act == openBookmarks:
+            self.__openBookmarks(selected=False)
+        elif act == newBookmark:
+            self.__newBookmark()
+        elif act == addBookmark:
+            self.__bookmarkCurrentPage()
+        elif act == deleteBookmarks:
+            self.__deleteBookmarks([
+                self.item(row) for row in range(self.count())
+            ])
+        elif act == exportBookmarks:
+            self.__exportBookmarks(selected=False)
+        elif act == importBookmarks:
+            self.__importBookmarks()
+    
+    @pyqtSlot(QPoint)
+    def __showBookmarkContextMenu(self, point):
+        """
+        Private slot to show the context menu for a bookmark.
+        
+        @param point position to open the menu at
+        @type QPoint
+        """
+        itm = self.selectedItems()[0]
+        url = itm.data(self.UrlRole)
+        validUrl = (
+            url is not None and not url.isEmpty() and url.isValid()
+        )
+        
+        menu = QMenu()
+        curPage = menu.addAction(self.tr("Open Link"))
+        curPage.setEnabled(validUrl)
+        newPage = menu.addAction(self.tr("Open Link in New Page"))
+        newPage.setEnabled(validUrl)
+        newBackgroundPage = menu.addAction(
+            self.tr("Open Link in Background Page"))
+        newBackgroundPage.setEnabled(validUrl)
+        menu.addSeparator()
+        copyUrl = menu.addAction(self.tr("Copy URL to Clipboard"))
+        copyUrl.setEnabled(validUrl)
+        menu.addSeparator()
+        newBookmark = menu.addAction(self.tr("New Bookmark"))
+        addBookmark = menu.addAction(self.tr("Bookmark Page"))
+        menu.addSeparator()
+        editBookmark = menu.addAction(self.tr("Edit Bookmark"))
+        menu.addSeparator()
+        deleteBookmark = menu.addAction(self.tr("Delete Bookmark"))
+        menu.addSeparator()
+        exportBookmarks = menu.addAction(self.tr("Export All Bookmarks"))
+        importBookmarks = menu.addAction(self.tr("Import Bookmarks"))
+        
+        act = menu.exec(self.mapToGlobal(point))
+        if act == curPage:
+            self.openUrl.emit(url)
+        elif act == newPage:
+            self.newTab.emit(url)
+        elif act == newBackgroundPage:
+            self.newBackgroundTab.emit(url)
+        elif act == copyUrl:
+            # copy the URL to both clipboard areas
+            QGuiApplication.clipboard().setText(
+                url.toString(), QClipboard.Mode.Clipboard)
+            QGuiApplication.clipboard().setText(
+                url.toString(), QClipboard.Mode.Selection)
+        elif act == newBookmark:
+            self.__newBookmark()
+        elif act == addBookmark:
+            self.__bookmarkCurrentPage()
+        elif act == editBookmark:
+            self.__editBookmark(itm)
+        elif act == deleteBookmark:
+            self.__deleteBookmarks([itm])
+        elif act == exportBookmarks:
+            self.__exportBookmarks(selected=False)
+        elif act == importBookmarks:
+            self.__importBookmarks()
+    
+    @pyqtSlot(QPoint)
+    def __showBookmarksContextMenu(self, point):
+        """
+        Private slot to show the context menu for multiple bookmark.
+        
+        @param point position to open the menu at
+        @type QPoint
+        """
+        menu = QMenu()
+        openBookmarks = menu.addAction(self.tr("Open Selected Bookmarks"))
+        menu.addSeparator()
+        deleteBookmarks = menu.addAction(self.tr("Delete Selected Bookmarks"))
+        menu.addSeparator()
+        exportBookmarks = menu.addAction(self.tr("Export Selected Bookmarks"))
+        exportAllBookmarks = menu.addAction(self.tr("Export All Bookmarks"))
+        importBookmarks = menu.addAction(self.tr("Import Bookmarks"))
+        
+        act = menu.exec(self.mapToGlobal(point))
+        if act == openBookmarks:
+            self.__openBookmarks(selected=True)
+        elif act == deleteBookmarks:
+            self.__deleteBookmarks(self.selectedItems())
+        elif act == exportBookmarks:
+            self.__exportBookmarks(selected=True)
+        elif act == exportAllBookmarks:
+            self.__exportBookmarks(selected=False)
+        elif act == importBookmarks:
+            self.__importBookmarks()
+    
+    @pyqtSlot(str, str)
+    def __addBookmark(self, title, url):
+        """
+        Private slot to add a bookmark entry.
+        
+        @param title title for the bookmark
+        @type str
+        @param url URL for the bookmark
+        @type str
+        """
+        url = url.strip()
+        
+        itm = QListWidgetItem(title, self)
+        itm.setData(self.UrlRole, QUrl(url))
+        itm.setToolTip(url)
+    
+    @pyqtSlot(str, QUrl)
+    def addBookmark(self, title, url):
+        """
+        Public slot to add a bookmark with given data.
+        
+        @param title title for the bookmark
+        @type str
+        @param url URL for the bookmark
+        @type QUrl
+        """
+        dlg = HelpBookmarkPropertiesDialog(title, url.toString(), self)
+        if dlg.exec() == QDialog.DialogCode.Accepted:
+            title, url = dlg.getData()
+            self.__addBookmark(title, url)
+            self.sortItems()
+            self.__saveBookmarks()
+    
+    @pyqtSlot()
+    def __bookmarkCurrentPage(self):
+        """
+        Private slot to bookmark the current page.
+        """
+        currentViewer = self.__helpViewer.currentViewer()
+        title = currentViewer.pageTitle()
+        url = currentViewer.link()
+        self.addBookmark(title, url)
+    
+    @pyqtSlot()
+    def __newBookmark(self):
+        """
+        Private slot to create a new bookmark.
+        """
+        dlg = HelpBookmarkPropertiesDialog(parent=self)
+        if dlg.exec() == QDialog.DialogCode.Accepted:
+            title, url = dlg.getData()
+            self.__addBookmark(title, url)
+            self.sortItems()
+            self.__saveBookmarks()
+    
+    @pyqtSlot()
+    def __editBookmark(self, itm):
+        """
+        Private slot to edit a bookmark.
+        
+        @param itm reference to the bookmark item to be edited
+        @type QListWidgetItem
+        """
+        dlg = HelpBookmarkPropertiesDialog(
+            itm.text(), itm.data(self.UrlRole).toString(), self)
+        if dlg.exec() == QDialog.DialogCode.Accepted:
+            title, url = dlg.getData()
+            itm.setText(title)
+            itm.setData(self.UrlRole, QUrl(url))
+            itm.setToolTip(url)
+            self.sortItems()
+            self.__saveBookmarks()
+    
+    @pyqtSlot(QListWidgetItem)
+    def __bookmarkActivated(self, itm):
+        """
+        Private slot handling the activation of a bookmark.
+        
+        @param itm reference to the activated item
+        @type QListWidgetItem
+        """
+        url = itm.data(self.UrlRole)
+        if url and not url.isEmpty() and url.isValid():
+            buttons = QApplication.mouseButtons()
+            modifiers = QApplication.keyboardModifiers()
+            
+            if buttons & Qt.MouseButton.MiddleButton:
+                self.newTab.emit(url)
+            else:
+                if (
+                    modifiers & (
+                        Qt.KeyboardModifier.ControlModifier |
+                        Qt.KeyboardModifier.ShiftModifier
+                    ) == (
+                        Qt.KeyboardModifier.ControlModifier |
+                        Qt.KeyboardModifier.ShiftModifier
+                    )
+                ):
+                    self.newBackgroundTab.emit(url)
+                elif modifiers & Qt.KeyboardModifier.ControlModifier:
+                    self.newTab.emit(url)
+                elif (
+                    modifiers & Qt.KeyboardModifier.ShiftModifier and
+                    not self.__internal
+                ):
+                    self.newWindow.emit(url)
+                else:
+                    self.openUrl.emit(url)
+    
+    def __openBookmarks(self, selected=False):
+        """
+        Private method to open all or selected bookmarks.
+        
+        @param selected flag indicating to open the selected bookmarks
+            (defaults to False)
+        @type bool (optional)
+        """
+        items = (
+            self.selectedItems()
+            if selected else
+            [self.item(row) for row in range(self.count())]
+        )
+        
+        for itm in items:
+            url = itm.data(self.UrlRole)
+            if url is not None and not url.isEmpty() and url.isValid():
+                self.newTab.emit(url)
+    
+    def __deleteBookmarks(self, items):
+        """
+        Private method to delete the given bookmark items.
+        
+        @param items list of bookmarks to be deleted
+        @type list of QListWidgetItem
+        """
+        from UI.DeleteFilesConfirmationDialog import (
+            DeleteFilesConfirmationDialog
+        )
+        dlg = DeleteFilesConfirmationDialog(
+            self,
+            self.tr("Delete Bookmarks"),
+            self.tr("Shall these bookmarks really be deleted?"),
+            [itm.text() for itm in items]
+        )
+        if dlg.exec() == QDialog.DialogCode.Accepted:
+            for itm in items:
+                self.takeItem(self.row(itm))
+                del itm
+            self.__saveBookmarks()
+    
+    def __loadBookmarks(self):
+        """
+        Private method to load the defined bookmarks.
+        """
+        bookmarksStr = Preferences.getHelp("Bookmarks")
+        with contextlib.suppress(ValueError):
+            bookmarks = json.loads(bookmarksStr)
+        
+        self.clear()
+        for bookmark in bookmarks:
+            self.__addBookmark(bookmark["title"], bookmark["url"])
+        self.sortItems()
+    
+    def __saveBookmarks(self):
+        """
+        Private method to save the defined bookmarks.
+        """
+        bookmarks = []
+        for row in range(self.count()):
+            itm = self.item(row)
+            bookmarks.append({
+                "title": itm.text(),
+                "url": itm.data(self.UrlRole).toString(),
+            })
+        Preferences.setHelp("Bookmarks", json.dumps(bookmarks))
+    
+    @pyqtSlot()
+    def __exportBookmarks(self, selected=False):
+        """
+        Private slot to export the bookmarks into a JSON file.
+        
+        @param selected flag indicating to export the selected bookmarks
+            (defaults to False)
+        @type bool (optional)
+        """
+        filename, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
+            self,
+            self.tr("Export Bookmarks"),
+            "",
+            self.tr("eric Bookmarks Files (*.json);;All Files (*)"),
+            None,
+            EricFileDialog.DontConfirmOverwrite
+        )
+        if filename:
+            ext = os.path.splitext(filename)[1]
+            if not ext:
+                ex = selectedFilter.split("(*")[1].split(")")[0]
+                if ex:
+                    filename += ex
+            
+            if os.path.exists(filename):
+                ok = EricMessageBox.yesNo(
+                    self,
+                    self.tr("Export Bookmarks"),
+                    self.tr("""The file <b>{0}</b> already exists. Do you"""
+                            """ want to overwrite it?""").format(filename))
+                if not ok:
+                    return
+            
+            bookmarksDict = {
+                "creator": "eric7",
+                "version": 1,
+                "created": datetime.datetime.now().isoformat(
+                    sep=" ", timespec="seconds"),
+                "bookmarks": []
+            }
+            bookmarkItems = (
+                self.selectedItems()
+                if selected else
+                [self.item(row) for row in range(self.count())]
+            )
+            for bookmarkItem in bookmarkItems:
+                bookmarksDict["bookmarks"].append({
+                    "type": "url",
+                    "title": bookmarkItem.text(),
+                    "url": bookmarkItem.data(self.UrlRole).toString(),
+                })
+            
+            jsonStr = json.dumps(bookmarksDict, indent=2, sort_keys=True)
+            try:
+                with open(filename, "w") as f:
+                    f.write(jsonStr)
+            except OSError as err:
+                EricMessageBox.critical(
+                    self,
+                    self.tr("Export Bookmarks"),
+                    self.tr("""<p>The bookmarks could not be exported"""
+                            """ to <b>{0}</b>.</p><p>Reason: {1}</p>""")
+                    .format(filename, str(err)))
+    
+    @pyqtSlot()
+    def __importBookmarks(self):
+        """
+        Private slot to import bookmarks from a JSON file.
+        """
+        from .HelpBookmarksImportDialog import HelpBookmarksImportDialog
+        
+        dlg = HelpBookmarksImportDialog(self)
+        if dlg.exec() == QDialog.DialogCode.Accepted:
+            replace, filename = dlg.getData()
+            
+            try:
+                with open(filename, "r") as f:
+                    jsonStr = f.read()
+                    bookmarks = json.loads(jsonStr)
+            except (OSError, json.JSONDecodeError) as err:
+                EricMessageBox.critical(
+                    self,
+                    self.tr("Import Bookmarks"),
+                    self.tr(
+                        "<p>The bookmarks file <b>{0}</b> could not be "
+                        "read.</p><p>Reason: {1}</p>"
+                    ).format(filename, str(err))
+                )
+                return
+            
+            if not isinstance(bookmarks, dict):
+                EricMessageBox.critical(
+                    self,
+                    self.tr("Import Bookmarks"),
+                    self.tr(
+                        "The bookmarks file <b>{0}</b> has invalid contents."
+                    ).format(filename)
+                )
+                return
+            
+            try:
+                if bookmarks["creator"] != "eric7":
+                    EricMessageBox.critical(
+                        self,
+                        self.tr("Import Bookmarks"),
+                        self.tr(
+                            "The bookmarks file <b>{0}</b> was not created"
+                            " with 'eric7'."
+                        ).format(filename)
+                    )
+                    return
+                
+                if bookmarks["version"] != 1:
+                    EricMessageBox.critical(
+                        self,
+                        self.tr("Import Bookmarks"),
+                        self.tr(
+                            "The bookmarks file <b>{0}</b> has an unsupported"
+                            " format version."
+                        ).format(filename)
+                    )
+                    return
+                
+                if replace:
+                    self.clear()
+                
+                for bookmark in bookmarks["bookmarks"]:
+                    if bookmark["type"] == "url":
+                        self.__addBookmark(bookmark["title"], bookmark["url"])
+                self.sortItems()
+                self.__saveBookmarks()
+            
+            except KeyError:
+                EricMessageBox.critical(
+                    self,
+                    self.tr("Import Bookmarks"),
+                    self.tr(
+                        "The bookmarks file <b>{0}</b> has invalid contents."
+                    ).format(filename)
+                )