eric: changeset 9473:3f23dbf37dbe

--- a/scripts/cleanupSource.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/scripts/cleanupSource.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,10 +8,10 @@
 Script for eric to clean up the source tree.
 """

+import fnmatch
 import os
+import shutil
 import sys
-import fnmatch
-import shutil


 def cleanupSource(dirName):
--- a/scripts/create_windows_links.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/scripts/create_windows_links.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@
 Installation script for the eric IDE and all eric related tools.
 """

+import contextlib
 import os
 import sys
-import contextlib

 from eric7.Globals import getConfig

@@ -94,8 +94,8 @@
     @param iconPath path of the icon file
     @type str
     """
+    from pywintypes import com_error
     from win32com.client import Dispatch
-    from pywintypes import com_error

     with contextlib.suppress(com_error):
         shell = Dispatch("WScript.Shell")
--- a/scripts/install.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/scripts/install.py	Fri Nov 04 13:52:26 2022 +0100
@@ -1213,10 +1213,10 @@

     if os.path.exists(os.path.join("eric", "eric7", "UI", "Info.py")):
         # Installing from archive
-        from eric.eric7.UI.Info import Version, CopyrightShort
+        from eric.eric7.UI.Info import CopyrightShort, Version
     elif os.path.exists(os.path.join("eric7", "UI", "Info.py")):
         # Installing from source tree
-        from eric7.UI.Info import Version, CopyrightShort
+        from eric7.UI.Info import CopyrightShort, Version
     else:
         Version = "Unknown"
         CopyrightShort = "(c) 2002 - 2022 Detlev Offenbach"
@@ -1989,8 +1989,8 @@
     @param iconPath path of the icon file
     @type str
     """
+    from pywintypes import com_error
     from win32com.client import Dispatch
-    from pywintypes import com_error

     with contextlib.suppress(com_error):
         shell = Dispatch("WScript.Shell")
--- a/src/eric7/CodeFormatting/BlackConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/BlackConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,17 +14,16 @@
 import black
 import tomlkit

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QFontMetricsF, QGuiApplication
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

+from . import BlackUtilities
 from .Ui_BlackConfigurationDialog import Ui_BlackConfigurationDialog

-from . import BlackUtilities
-

 class BlackConfigurationDialog(QDialog, Ui_BlackConfigurationDialog):
     """
--- a/src/eric7/CodeFormatting/BlackFormattingDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/BlackFormattingDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,7 +16,7 @@

 import black

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication, QObject
+from PyQt6.QtCore import QCoreApplication, QObject, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
     QAbstractButton,
     QDialog,
@@ -25,15 +25,13 @@
     QTreeWidgetItem,
 )

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox

-from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog
-
 from . import BlackUtilities
+from .BlackFormattingAction import BlackFormattingAction
 from .FormattingDiffWidget import FormattingDiffWidget
-from .BlackFormattingAction import BlackFormattingAction
-
-from eric7 import Preferences, Utilities
+from .Ui_BlackFormattingDialog import Ui_BlackFormattingDialog


 class BlackFormattingDialog(QDialog, Ui_BlackFormattingDialog):
--- a/src/eric7/CodeFormatting/BlackUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/BlackUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 import re

+import black
+
 from PyQt6.QtCore import QCoreApplication, pyqtSlot

 from eric7.EricWidgets import EricMessageBox

-import black
-

 def getDefaultConfiguration():
     """
--- a/src/eric7/CodeFormatting/FormattingDiffWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/FormattingDiffWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,10 @@

 from PyQt6.QtWidgets import QWidget

-from .Ui_FormattingDiffWidget import Ui_FormattingDiffWidget
-
+from eric7 import Preferences
 from eric7.UI.DiffHighlighter import DiffHighlighter

-from eric7 import Preferences
+from .Ui_FormattingDiffWidget import Ui_FormattingDiffWidget


 class FormattingDiffWidget(QWidget, Ui_FormattingDiffWidget):
--- a/src/eric7/CodeFormatting/IsortConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/IsortConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,6 +11,12 @@
 import copy
 import pathlib

+import tomlkit
+
+from isort import Config
+from isort.profiles import profiles
+from isort.settings import VALID_PY_TARGETS
+from isort.wrap_modes import WrapModes
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QGuiApplication
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
@@ -18,14 +24,6 @@
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from isort import Config
-from isort.profiles import profiles
-from isort.settings import VALID_PY_TARGETS
-from isort.wrap_modes import WrapModes
-
-import tomlkit
-
-
 from .Ui_IsortConfigurationDialog import Ui_IsortConfigurationDialog
--- a/src/eric7/CodeFormatting/IsortFormattingDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CodeFormatting/IsortFormattingDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,8 +16,7 @@

 from isort import settings
 from isort.api import check_file, sort_file
-
-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QAbstractButton,
     QDialog,
@@ -32,7 +31,6 @@
 from .FormattingDiffWidget import FormattingDiffWidget
 from .IsortFormattingAction import IsortFormattingAction
 from .IsortUtilities import suppressStderr
-
 from .Ui_IsortFormattingDialog import Ui_IsortFormattingDialog
--- a/src/eric7/CondaInterface/Conda.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/Conda.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,17 @@
 Package implementing the conda GUI logic.
 """

+import contextlib
 import json
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject, QProcess, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject, QProcess, pyqtSignal
 from PyQt6.QtWidgets import QDialog

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Globals, Preferences
-
-from . import rootPrefix, condaVersion
+from . import condaVersion, rootPrefix
 from .CondaExecDialog import CondaExecDialog
--- a/src/eric7/CondaInterface/CondaExecDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/CondaExecDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,14 @@

 import json

-from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import QProcess, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_CondaExecDialog import Ui_CondaExecDialog

-from eric7 import Globals, Preferences
-

 class CondaExecDialog(QDialog, Ui_CondaExecDialog):
     """
--- a/src/eric7/CondaInterface/CondaExportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/CondaExportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,13 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, QApplication
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QApplication, QDialog, QDialogButtonBox

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .Ui_CondaExportDialog import Ui_CondaExportDialog
--- a/src/eric7/CondaInterface/CondaInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/CondaInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QDialog

-from .Ui_CondaInfoDialog import Ui_CondaInfoDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_CondaInfoDialog import Ui_CondaInfoDialog


 class CondaInfoDialog(QDialog, Ui_CondaInfoDialog):
--- a/src/eric7/CondaInterface/CondaPackageDetailsWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/CondaPackageDetailsWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing a widget and a dialog to show package details.
 """

-from PyQt6.QtCore import Qt, QDateTime
-from PyQt6.QtWidgets import QWidget, QDialog, QVBoxLayout, QDialogButtonBox
+from PyQt6.QtCore import QDateTime, Qt
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QWidget
+
+from eric7.Globals import dataString

 from .Ui_CondaPackageDetailsWidget import Ui_CondaPackageDetailsWidget

-from eric7.Globals import dataString
-

 class CondaPackageDetailsWidget(QWidget, Ui_CondaPackageDetailsWidget):
     """
--- a/src/eric7/CondaInterface/CondaPackagesWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CondaInterface/CondaPackagesWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,27 +9,25 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QToolButton,
+    QApplication,
+    QDialog,
+    QLineEdit,
     QMenu,
+    QToolButton,
     QTreeWidgetItem,
-    QApplication,
-    QLineEdit,
-    QDialog,
+    QWidget,
 )

+from eric7 import CondaInterface
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox, EricTextInputDialog
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .Ui_CondaPackagesWidget import Ui_CondaPackagesWidget

-from eric7.EricGui import EricPixmapCache
-
-from eric7 import CondaInterface
-

 class CondaPackagesWidget(QWidget, Ui_CondaPackagesWidget):
     """
--- a/src/eric7/Cooperation/ChatWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Cooperation/ChatWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,19 @@

 import pathlib

-from PyQt6.QtCore import Qt, pyqtSlot, pyqtSignal, QDateTime, QPoint
+from PyQt6.QtCore import QDateTime, QPoint, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QColor
-from PyQt6.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication
+from PyQt6.QtWidgets import QApplication, QListWidgetItem, QMenu, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
 from eric7.Globals import recentNameHosts

 from .CooperationClient import CooperationClient
-
 from .Ui_ChatWidget import Ui_ChatWidget

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class ChatWidget(QWidget, Ui_ChatWidget):
     """
--- a/src/eric7/Cooperation/Connection.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Cooperation/Connection.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,13 @@
 Module implementing a class representing a peer connection.
 """

-from PyQt6.QtCore import pyqtSignal, QTimer, QTime, QByteArray
-from PyQt6.QtNetwork import QTcpSocket, QHostInfo
+from PyQt6.QtCore import QByteArray, QTime, QTimer, pyqtSignal
+from PyQt6.QtNetwork import QHostInfo, QTcpSocket

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-
 MaxBufferSize = 1024 * 1024
 TransferTimeout = 30 * 1000
 PongTimeout = 60 * 1000
--- a/src/eric7/Cooperation/CooperationClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Cooperation/CooperationClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,14 @@

 import collections

-from PyQt6.QtCore import QObject, pyqtSignal, QProcess
-from PyQt6.QtNetwork import QHostInfo, QHostAddress, QAbstractSocket, QNetworkInterface
-
-from .CooperationServer import CooperationServer
-from .Connection import Connection
+from PyQt6.QtCore import QObject, QProcess, pyqtSignal
+from PyQt6.QtNetwork import QAbstractSocket, QHostAddress, QHostInfo, QNetworkInterface

 from eric7 import Preferences

+from .Connection import Connection
+from .CooperationServer import CooperationServer
+

 class CooperationClient(QObject):
     """
--- a/src/eric7/Cooperation/CooperationServer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Cooperation/CooperationServer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSignal
 from PyQt6.QtNetwork import QTcpServer

-from .Connection import Connection
+from eric7 import Preferences

-from eric7 import Preferences
+from .Connection import Connection


 class CooperationServer(QTcpServer):
--- a/src/eric7/CycloneDXInterface/CycloneDXMetaDataDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CycloneDXInterface/CycloneDXMetaDataDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a dialog to edit the metadata of the CycloneDX SBOM.
 """

-from PyQt6.QtCore import pyqtSlot, QCoreApplication
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox
+import trove_classifiers

 from cyclonedx.model.component import ComponentType
-import trove_classifiers
+from PyQt6.QtCore import QCoreApplication, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_CycloneDXMetaDataDialog import Ui_CycloneDXMetaDataDialog
--- a/src/eric7/CycloneDXInterface/CycloneDXUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/CycloneDXInterface/CycloneDXUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,6 @@

 import os

-from PyQt6.QtCore import QCoreApplication
-from PyQt6.QtWidgets import QDialog
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
-from packageurl import PackageURL
-
 from cyclonedx.model import (
     ExternalReference,
     ExternalReferenceType,
@@ -29,17 +21,18 @@
 from cyclonedx.model.bom import Bom
 from cyclonedx.model.component import Component
 from cyclonedx.model.vulnerability import Vulnerability, VulnerabilitySource
-from cyclonedx.output import (
-    OutputFormat,
-    SchemaVersion,
-    get_instance as get_output_instance,
-)
+from cyclonedx.output import OutputFormat, SchemaVersion
+from cyclonedx.output import get_instance as get_output_instance
 from cyclonedx.parser import BaseParser
-
 from cyclonedx_py.parser.pipenv import PipEnvFileParser
 from cyclonedx_py.parser.poetry import PoetryFileParser
 from cyclonedx_py.parser.requirements import RequirementsFileParser
+from packageurl import PackageURL
+from PyQt6.QtCore import QCoreApplication
+from PyQt6.QtWidgets import QDialog

+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.PipInterface.PipVulnerabilityChecker import Package, VulnerabilityCheckError
--- a/src/eric7/DataViews/CodeMetrics.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DataViews/CodeMetrics.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,9 +15,9 @@
 """


-import os
 import io
 import keyword
+import os
 import token
 import tokenize
--- a/src/eric7/DataViews/CodeMetricsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DataViews/CodeMetricsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,22 +12,21 @@
 import os
 import time

-from PyQt6.QtCore import pyqtSlot, Qt, QLocale
+from PyQt6.QtCore import QLocale, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QMenu,
-    QHeaderView,
     QTreeWidgetItem,
-    QApplication,
 )

+from eric7 import Utilities
 from eric7.EricWidgets.EricApplication import ericApp

+from . import CodeMetrics
 from .Ui_CodeMetricsDialog import Ui_CodeMetricsDialog
-from . import CodeMetrics
-
-from eric7 import Utilities


 class CodeMetricsDialog(QDialog, Ui_CodeMetricsDialog):
--- a/src/eric7/DataViews/PyCoverageDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DataViews/PyCoverageDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,26 +10,25 @@
 import os
 import time

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
+from coverage import Coverage
+from coverage.misc import CoverageException
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QMenu,
-    QHeaderView,
     QTreeWidgetItem,
-    QApplication,
 )

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_PyCoverageDialog import Ui_PyCoverageDialog

-from eric7 import Utilities
-from coverage import Coverage
-from coverage.misc import CoverageException
-

 class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
     """
--- a/src/eric7/DataViews/PyProfileDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DataViews/PyProfileDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,18 +13,18 @@

 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QMenu,
-    QHeaderView,
     QTreeWidgetItem,
-    QApplication,
 )

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox

 from .Ui_PyProfileDialog import Ui_PyProfileDialog
-from eric7 import Utilities


 class ProfileTreeWidgetItem(QTreeWidgetItem):
--- a/src/eric7/DebugClients/Python/AsyncFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/AsyncFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,9 +8,9 @@
 debugger.
 """

+import contextlib
 import socket
 import threading
-import contextlib

 from DebugUtilities import prepareJsonCommand
--- a/src/eric7/DebugClients/Python/BreakpointWatch.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/BreakpointWatch.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the breakpoint and watch class.
 """

+import contextlib
 import os
-import contextlib


 class Breakpoint:
--- a/src/eric7/DebugClients/Python/DebugBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,19 @@
 Module implementing the debug base class which based originally on bdb.
 """

-import sys
-import os
-import types
+import _thread
 import atexit
+import contextlib
+import ctypes
+import dis
 import inspect
-import ctypes
+import os
+import sys
 import time
-import dis
-import contextlib
+import types

 from BreakpointWatch import Breakpoint, Watch
-
-import _thread
-from DebugUtilities import getargvalues, formatargvalues
+from DebugUtilities import formatargvalues, getargvalues

 gRecursionLimit = 64
--- a/src/eric7/DebugClients/Python/DebugClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from DebugBase import DebugBase
 from DebugClientBase import DebugClientBase
+from ModuleLoader import ModuleLoader
 from ThreadExtension import ThreadExtension
-from ModuleLoader import ModuleLoader


 class DebugClient(DebugClientBase, DebugBase, ThreadExtension):
--- a/src/eric7/DebugClients/Python/DebugClientBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugClientBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -25,16 +25,15 @@

 import DebugClientCapabilities
 import DebugVariables
-from DebugBase import setRecursionLimit, printerr  # __IGNORE_WARNING__
+
 from AsyncFile import AsyncFile, AsyncPendingWrite
-from DebugConfig import SpecialAttributes, NonExpandableTypes
+from BreakpointWatch import Breakpoint, Watch
+from DebugBase import printerr, setRecursionLimit  # __IGNORE_WARNING__
+from DebugConfig import NonExpandableTypes, SpecialAttributes
+from DebugUtilities import formatargvalues, getargvalues, prepareJsonCommand
 from FlexCompleter import Completer
-from DebugUtilities import prepareJsonCommand
-from BreakpointWatch import Breakpoint, Watch
 from MultiProcessDebugExtension import patchNewProcessFunctions

-from DebugUtilities import getargvalues, formatargvalues
-
 DebugClientInstance = None

 ###############################################################################
--- a/src/eric7/DebugClients/Python/DebugUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,16 @@

 import json
 import os
+import sys
 import traceback
-import sys
+
+from collections import namedtuple
+from inspect import iscode, isframe

 #
 # Taken from inspect.py of Python 3.4
 #

-from collections import namedtuple
-from inspect import iscode, isframe

 # Create constants for the compiler flags in Include/code.h
 # We try to get them from dis to avoid duplication, but fall
--- a/src/eric7/DebugClients/Python/DebugVariables.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/DebugVariables.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,7 +12,7 @@

 from collections.abc import ItemsView, KeysView, ValuesView

-from DebugConfig import ConfigQtNames, ConfigKnownQtTypes, BatchSize
+from DebugConfig import BatchSize, ConfigKnownQtTypes, ConfigQtNames

 #
 # This code was inspired by pydevd.
--- a/src/eric7/DebugClients/Python/FlexCompleter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/FlexCompleter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -49,6 +49,7 @@
 """

 import builtins
+
 import __main__

 __all__ = ["Completer"]
--- a/src/eric7/DebugClients/Python/ModuleLoader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/ModuleLoader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing an import hook patching modules to support debugging.
 """

+import importlib
 import sys
-import importlib

+from MultiprocessingExtension import patchMultiprocessing
 from QProcessExtension import patchQProcess
 from SubprocessExtension import patchSubprocess
-from MultiprocessingExtension import patchMultiprocessing


 class ModuleLoader:
--- a/src/eric7/DebugClients/Python/MultiProcessDebugExtension.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/MultiProcessDebugExtension.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,10 @@
 import contextlib

 from DebugUtilities import (
+    isPythonProgram,
+    isWindowsPlatform,
     patchArguments,
     patchArgumentStringWindows,
-    isPythonProgram,
-    isWindowsPlatform,
 )

 _debugClient = None
@@ -415,7 +415,6 @@
     # -    patchModule(os, "execve", createExecve)
     # -    patchModule(os, "execvp", createExecv)
     # -    patchModule(os, "execvpe", createExecve)
-
     # patch 'os.spawn...()' functions
     patchModule(os, "spawnl", createSpawnl)
     patchModule(os, "spawnle", createSpawnl)
--- a/src/eric7/DebugClients/Python/PyProfile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/PyProfile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -6,12 +6,12 @@
 Module defining additions to the standard Python profile.py.
 """

+import atexit
+import contextlib
+import marshal
 import os
-import marshal
+import pickle  # secok
 import profile
-import atexit
-import pickle  # secok
-import contextlib


 class PyProfile(profile.Profile):
--- a/src/eric7/DebugClients/Python/QProcessExtension.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/QProcessExtension.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@

 import os

-from DebugUtilities import isPythonProgram, startsWithShebang, patchArguments
+from DebugUtilities import isPythonProgram, patchArguments, startsWithShebang

 _debugClient = None
--- a/src/eric7/DebugClients/Python/SubprocessExtension.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/SubprocessExtension.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,9 +13,9 @@

 from DebugUtilities import (
     isPythonProgram,
+    isWindowsPlatform,
     patchArguments,
     stringToArgumentsWindows,
-    isWindowsPlatform,
 )

 _debugClient = None
--- a/src/eric7/DebugClients/Python/ThreadExtension.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DebugClients/Python/ThreadExtension.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,10 @@
 Module implementing an import hook patching thread modules to get debugged too.
 """

+import _thread
+import contextlib
 import os
 import sys
-import contextlib
-
-import _thread
 import threading

 from DebugBase import DebugBase
--- a/src/eric7/Debugger/BreakPointViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/BreakPointViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,12 @@

 import pathlib

-from PyQt6.QtCore import pyqtSignal, Qt, QItemSelectionModel, QSortFilterProxyModel
-from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QHeaderView, QMenu, QDialog
-
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.Globals import recentNameBreakpointFiles, recentNameBreakpointConditions
+from PyQt6.QtCore import QItemSelectionModel, QSortFilterProxyModel, Qt, pyqtSignal
+from PyQt6.QtWidgets import QAbstractItemView, QDialog, QHeaderView, QMenu, QTreeView

 from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import recentNameBreakpointConditions, recentNameBreakpointFiles


 class BreakPointViewer(QTreeView):
--- a/src/eric7/Debugger/CallStackViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/CallStackViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,18 @@

 import pathlib

-from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtWidgets import (
+    QLabel,
+    QMenu,
     QTreeWidget,
     QTreeWidgetItem,
-    QMenu,
+    QVBoxLayout,
     QWidget,
-    QVBoxLayout,
-    QLabel,
 )

+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox


 class CallStackViewer(QWidget):
--- a/src/eric7/Debugger/CallTraceViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/CallTraceViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,16 @@
 import pathlib
 import re

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt6.QtWidgets import QWidget, QTreeWidgetItem
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QTreeWidgetItem, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox

 from .Ui_CallTraceViewer import Ui_CallTraceViewer

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class CallTraceViewer(QWidget, Ui_CallTraceViewer):
     """
--- a/src/eric7/Debugger/DebugServer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/DebugServer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,22 +7,20 @@
 Module implementing the debug server.
 """

+import contextlib
 import os
 import shlex
-import contextlib
+
+from PyQt6.QtCore import QModelIndex, pyqtSignal, pyqtSlot
+from PyQt6.QtNetwork import QHostAddress, QHostInfo, QNetworkInterface, QTcpServer

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QModelIndex
-from PyQt6.QtNetwork import QTcpServer, QHostAddress, QHostInfo, QNetworkInterface
+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
+from . import DebugClientCapabilities
 from .BreakPointModel import BreakPointModel
 from .WatchPointModel import WatchPointModel
-from . import DebugClientCapabilities
-
-from eric7 import Preferences
-

 DebuggerInterfaces = {
     "Python": "DebuggerInterfacePython",
--- a/src/eric7/Debugger/DebugUI.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/DebugUI.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,33 +7,30 @@
 Module implementing the debugger UI.
 """

-import os
+import contextlib
 import copy
-import contextlib
-
-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, Qt, QKeyCombination
+import os
+
+from PyQt6.QtCore import QKeyCombination, QObject, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QKeySequence
-from PyQt6.QtWidgets import QMenu, QToolBar, QApplication, QDialog
-
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QToolBar
+
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.Globals import recentNameBreakpointConditions
+from eric7.UI import Config
 from eric7.UI.Info import Program
 from eric7.UI.NotificationWidget import NotificationTypes

 from .DebugClientCapabilities import (
+    HasCoverage,
     HasDebugger,
     HasInterpreter,
     HasProfiler,
-    HasCoverage,
 )

-from eric7.Globals import recentNameBreakpointConditions
-
-from eric7 import Preferences, Utilities
-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-

 class DebugUI(QObject):
     """
--- a/src/eric7/Debugger/DebugViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/DebugViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -23,25 +23,24 @@

 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QComboBox,
     QHBoxLayout,
+    QHeaderView,
+    QLabel,
     QLineEdit,
-    QSizePolicy,
     QPushButton,
-    QComboBox,
-    QLabel,
+    QSizePolicy,
+    QSplitter,
     QTreeWidget,
     QTreeWidgetItem,
-    QHeaderView,
-    QSplitter,
+    QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-
 from eric7.EricWidgets.EricTabWidget import EricTabWidget
--- a/src/eric7/Debugger/DebuggerInterfaceNone.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/DebuggerInterfaceNone.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,6 @@

 from PyQt6.QtCore import QObject

-
 ClientDefaultCapabilities = 0

 ClientTypeAssociations = []
--- a/src/eric7/Debugger/DebuggerInterfacePython.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/DebuggerInterfacePython.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,23 +7,20 @@
 Module implementing the Python3 debugger interface for the debug server.
 """

-import os
+import contextlib
 import logging
+import os
 import shlex
-import contextlib

 from PyQt6.QtCore import QObject, QProcess, QProcessEnvironment, QTimer

+from eric7 import Globals, Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import getConfig

 from . import DebugClientCapabilities

-from eric7 import Globals, Preferences, Utilities
-
-from eric7.Globals import getConfig
-
-
 ClientDefaultCapabilities = DebugClientCapabilities.HasAll
--- a/src/eric7/Debugger/EditBreakpointDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/EditBreakpointDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os.path

-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox
+from PyQt6.QtWidgets import QComboBox, QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
--- a/src/eric7/Debugger/ExceptionLogger.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/ExceptionLogger.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 import contextlib

-from PyQt6.QtCore import pyqtSignal, Qt
-from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QMenu
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtWidgets import QMenu, QTreeWidget, QTreeWidgetItem

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Debugger/StartDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/StartDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 import os

-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox, QInputDialog
-
-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtWidgets import QComboBox, QDialog, QDialogButtonBox, QInputDialog

 from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes


 class StartDialog(QDialog):
--- a/src/eric7/Debugger/StartHistoryEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/StartHistoryEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit a list of history entries.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/Debugger/VariablesFilterDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/VariablesFilterDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the variables filter dialog.
 """

-from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

+from eric7 import Preferences
 from eric7.Debugger.Config import ConfigVarTypeDispStrings
-from eric7 import Preferences

 from .Ui_VariablesFilterDialog import Ui_VariablesFilterDialog
--- a/src/eric7/Debugger/VariablesViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/VariablesViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,26 +8,25 @@
 """

 import ast
+import contextlib
 import re
-import contextlib

 from PyQt6.QtCore import (
-    Qt,
     QAbstractItemModel,
+    QCoreApplication,
     QModelIndex,
-    QCoreApplication,
     QSortFilterProxyModel,
+    Qt,
     pyqtSignal,
 )
 from PyQt6.QtGui import QBrush, QFontMetrics
-from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QToolTip, QMenu
+from PyQt6.QtWidgets import QAbstractItemView, QMenu, QToolTip, QTreeView

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricApplication import ericApp

 from .Config import ConfigVarTypeDispStrings

-from eric7 import Preferences, Utilities
-
 SORT_ROLE = Qt.ItemDataRole.UserRole
--- a/src/eric7/Debugger/WatchPointViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Debugger/WatchPointViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the watch expression viewer widget.
 """

-from PyQt6.QtCore import Qt, QModelIndex, QItemSelectionModel, QSortFilterProxyModel
-from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QMenu, QHeaderView, QDialog
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtCore import QItemSelectionModel, QModelIndex, QSortFilterProxyModel, Qt
+from PyQt6.QtWidgets import QAbstractItemView, QDialog, QHeaderView, QMenu, QTreeView

 from eric7 import Utilities
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp


 class WatchPointViewer(QTreeView):
--- a/src/eric7/DocumentationTools/IndexGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DocumentationTools/IndexGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 generator.
 """

+import os
 import sys
-import os

 from eric7.Utilities import joinext
--- a/src/eric7/DocumentationTools/ModuleDocumentor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DocumentationTools/ModuleDocumentor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@
 this module.
 """

-import sys
+import contextlib
 import re
-import contextlib
+import sys

 from eric7.Utilities import html_uencode
 from eric7.Utilities.ModuleParser import RB_SOURCE, Function
--- a/src/eric7/DocumentationTools/QtHelpGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/DocumentationTools/QtHelpGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,12 +8,12 @@
 generator.
 """

-import sys
 import os
 import shutil
 import subprocess  # secok
+import sys

-from eric7.Utilities import joinext, html_encode, getQtBinariesPath, generateQtToolName
+from eric7.Utilities import generateQtToolName, getQtBinariesPath, html_encode, joinext

 HelpCollection = r"""<?xml version="1.0" encoding="utf-8" ?>
 <QHelpCollectionProject version="1.0">
--- a/src/eric7/EricCore/EricTreeSortFilterProxyModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricCore/EricTreeSortFilterProxyModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a modified QSortFilterProxyModel.
 """

-from PyQt6.QtCore import Qt, QModelIndex, QSortFilterProxyModel
+from PyQt6.QtCore import QModelIndex, QSortFilterProxyModel, Qt


 class EricTreeSortFilterProxyModel(QSortFilterProxyModel):
--- a/src/eric7/EricGraphics/EricArrowItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGraphics/EricArrowItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,8 +10,8 @@
 import enum
 import math

-from PyQt6.QtCore import QPointF, QRectF, QSizeF, QLineF, Qt
-from PyQt6.QtGui import QPen, QPolygonF, QColor
+from PyQt6.QtCore import QLineF, QPointF, QRectF, QSizeF, Qt
+from PyQt6.QtGui import QColor, QPen, QPolygonF
 from PyQt6.QtWidgets import QAbstractGraphicsShapeItem, QGraphicsItem, QStyle

 ArrowheadAngleFactor = 0.26179938779914941
--- a/src/eric7/EricGraphics/EricGraphicsView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGraphics/EricGraphicsView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,13 @@

 import sys

-from PyQt6.QtCore import pyqtSignal, QRectF, QSize, QSizeF, Qt
-from PyQt6.QtGui import QBrush, QPainter, QPixmap, QFont, QColor
+from PyQt6.QtCore import QRectF, QSize, QSizeF, Qt, pyqtSignal
+from PyQt6.QtGui import QBrush, QColor, QFont, QPainter, QPixmap
 from PyQt6.QtWidgets import QGraphicsView

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-

 class EricGraphicsView(QGraphicsView):
     """
--- a/src/eric7/EricGui/EricAction.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGui/EricAction.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 shortcuts.
 """

-from PyQt6.QtGui import QIcon, QKeySequence, QAction, QActionGroup
+from PyQt6.QtGui import QAction, QActionGroup, QIcon, QKeySequence

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/EricGui/EricGenericDiffHighlighter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGui/EricGenericDiffHighlighter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import re

-from PyQt6.QtGui import QSyntaxHighlighter, QTextCharFormat, QFont
+from PyQt6.QtGui import QFont, QSyntaxHighlighter, QTextCharFormat

 from eric7 import Preferences
--- a/src/eric7/EricGui/EricOverrideCursor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGui/EricOverrideCursor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QEventLoop
+from PyQt6.QtCore import QEventLoop, QProcess, Qt, pyqtSlot
 from PyQt6.QtGui import QCursor, QGuiApplication
--- a/src/eric7/EricGui/EricPixmapCache.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricGui/EricPixmapCache.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 import os

-from PyQt6.QtCore import Qt, QSize
-from PyQt6.QtGui import QPixmap, QIcon, QPainter
+from PyQt6.QtCore import QSize, Qt
+from PyQt6.QtGui import QIcon, QPainter, QPixmap


 class EricPixmapCache:
--- a/src/eric7/EricNetwork/EricFtp.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricFtp.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,6 +10,7 @@

 import enum
 import ftplib  # secok
+
 from socket import _GLOBAL_DEFAULT_TIMEOUT
--- a/src/eric7/EricNetwork/EricGoogleMail.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricGoogleMail.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,25 +7,19 @@
 Module implementing a dialog to send bug reports.
 """

+import base64
 import os
-import base64

-from googleapiclient import discovery, errors
-from google.oauth2.credentials import Credentials, UserAccessTokenCredentials
+from google.auth.exceptions import RefreshError
 from google.auth.transport.requests import Request
-from google.auth.exceptions import RefreshError
+from google.oauth2.credentials import Credentials, UserAccessTokenCredentials
 from google_auth_oauthlib.flow import InstalledAppFlow
-
-
-from PyQt6.QtCore import pyqtSignal, QObject
+from googleapiclient import discovery, errors
+from PyQt6.QtCore import QObject, pyqtSignal

 from eric7 import Globals

-from .EricGoogleMailHelpers import (
-    CLIENT_SECRET_FILE,
-    SCOPES,
-    TOKEN_FILE,
-)
+from .EricGoogleMailHelpers import CLIENT_SECRET_FILE, SCOPES, TOKEN_FILE


 class EricGoogleMail(QObject):
--- a/src/eric7/EricNetwork/EricJsonClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricJsonClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing the JSON based client base class.
 """

+import contextlib
 import io
-import sys
-import socket
+import json
 import select
+import socket
+import sys
 import traceback
-import json
-import contextlib


 class EricJsonClient:
--- a/src/eric7/EricNetwork/EricJsonServer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricJsonServer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,19 +11,18 @@
 import json

 from PyQt6.QtCore import (
-    pyqtSlot,
-    QProcess,
-    QProcessEnvironment,
     QCoreApplication,
     QEventLoop,
+    QProcess,
+    QProcessEnvironment,
+    QThread,
     QTimer,
-    QThread,
+    pyqtSlot,
 )
-from PyQt6.QtNetwork import QTcpServer, QHostAddress
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtNetwork import QHostAddress, QTcpServer

 from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox


 class EricJsonServer(QTcpServer):
--- a/src/eric7/EricNetwork/EricJsonStreamReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricJsonStreamReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,10 @@
 import json

 from PyQt6.QtCore import pyqtSignal, pyqtSlot
-from PyQt6.QtNetwork import QTcpServer, QHostAddress
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtNetwork import QHostAddress, QTcpServer

 from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox


 class EricJsonReader(QTcpServer):
--- a/src/eric7/EricNetwork/EricNetworkIcon.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricNetworkIcon.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 from PyQt6.QtNetwork import QNetworkInformation
 from PyQt6.QtWidgets import QLabel

+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences


 class EricNetworkIcon(QLabel):
--- a/src/eric7/EricNetwork/EricNetworkProxyFactory.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricNetworkProxyFactory.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,12 @@
 import os
 import re

-from PyQt6.QtCore import QUrl, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QUrl
+from PyQt6.QtNetwork import QNetworkProxy, QNetworkProxyFactory, QNetworkProxyQuery
 from PyQt6.QtWidgets import QDialog
-from PyQt6.QtNetwork import QNetworkProxyFactory, QNetworkProxy, QNetworkProxyQuery
-
-from eric7.EricWidgets import EricMessageBox

 from eric7 import Globals, Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox


 def schemeFromProxyType(proxyType):
--- a/src/eric7/EricNetwork/EricSslCertificateSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslCertificateSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,17 +9,17 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 with contextlib.suppress(ImportError):
     from PyQt6.QtNetwork import QSslCertificate

-from .Ui_EricSslCertificateSelectionDialog import Ui_EricSslCertificateSelectionDialog
-
 from eric7 import Utilities
 from eric7.EricGui import EricPixmapCache

+from .Ui_EricSslCertificateSelectionDialog import Ui_EricSslCertificateSelectionDialog
+

 class EricSslCertificateSelectionDialog(QDialog, Ui_EricSslCertificateSelectionDialog):
     """
--- a/src/eric7/EricNetwork/EricSslCertificatesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslCertificatesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,19 +10,18 @@
 import contextlib
 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt, QByteArray
+from PyQt6.QtCore import QByteArray, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 with contextlib.suppress(ImportError):
     from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration, QSsl

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox

 from .Ui_EricSslCertificatesDialog import Ui_EricSslCertificatesDialog

-from eric7 import Globals, Preferences, Utilities
-from eric7.EricGui import EricPixmapCache
-

 class EricSslCertificatesDialog(QDialog, Ui_EricSslCertificatesDialog):
     """
--- a/src/eric7/EricNetwork/EricSslCertificatesInfoWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslCertificatesInfoWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget to show SSL certificate infos.
 """

-from PyQt6.QtCore import pyqtSlot, QCryptographicHash, QDateTime
+from PyQt6.QtCore import QCryptographicHash, QDateTime, pyqtSlot
 from PyQt6.QtWidgets import QWidget

 try:
@@ -15,9 +15,9 @@
 except ImportError:
     QSslCertificate = None

-from .Ui_EricSslCertificatesInfoWidget import Ui_EricSslCertificatesInfoWidget
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_EricSslCertificatesInfoWidget import Ui_EricSslCertificatesInfoWidget


 class EricSslCertificatesInfoWidget(QWidget, Ui_EricSslCertificatesInfoWidget):
--- a/src/eric7/EricNetwork/EricSslErrorHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslErrorHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,12 +11,11 @@
 import enum
 import platform

-from PyQt6.QtCore import QObject, QByteArray
-from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration, QSslError, QSsl
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtCore import QByteArray, QObject
+from PyQt6.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslError

 from eric7 import Globals, Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox


 class EricSslErrorState(enum.Enum):
--- a/src/eric7/EricNetwork/EricSslInfoWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricNetwork/EricSslInfoWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a widget to show SSL information.
 """

-from PyQt6.QtCore import Qt, QUrl, QPoint
-from PyQt6.QtWidgets import QMenu, QGridLayout, QLabel, QSizePolicy
-from PyQt6.QtNetwork import QSsl, QSslConfiguration, QSslCertificate
+from PyQt6.QtCore import QPoint, Qt, QUrl
+from PyQt6.QtNetwork import QSsl, QSslCertificate, QSslConfiguration
+from PyQt6.QtWidgets import QGridLayout, QLabel, QMenu, QSizePolicy

+from eric7 import Utilities
 from eric7.EricGui import EricPixmapCache
-from eric7 import Utilities


 class EricSslInfoWidget(QMenu):
--- a/src/eric7/EricWidgets/EricAnimatedLabel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricAnimatedLabel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a label widget showing an animated pixmap.
 """

-from PyQt6.QtCore import pyqtSlot, QTimer
+from PyQt6.QtCore import QTimer, pyqtSlot
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtWidgets import QLabel
--- a/src/eric7/EricWidgets/EricAnimatedWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricAnimatedWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,7 @@
 # Code was inspired by qupzilla web browser
 #

-from PyQt6.QtCore import pyqtSlot, QTimeLine, QPoint
+from PyQt6.QtCore import QPoint, QTimeLine, pyqtSlot
 from PyQt6.QtWidgets import QWidget
--- a/src/eric7/EricWidgets/EricApplication.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricApplication.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtGui import QColor, QPalette
 from PyQt6.QtWidgets import QApplication
--- a/src/eric7/EricWidgets/EricClickableLabel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricClickableLabel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a clickable label.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSignal
 from PyQt6.QtWidgets import QLabel
--- a/src/eric7/EricWidgets/EricCompleters.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricCompleters.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import QDir, Qt, QStringListModel
+from PyQt6.QtCore import QDir, QStringListModel, Qt
 from PyQt6.QtGui import QFileSystemModel
 from PyQt6.QtWidgets import QCompleter
--- a/src/eric7/EricWidgets/EricDirFileDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricDirFileDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import pathlib

-from PyQt6.QtCore import pyqtSlot, QItemSelection
+from PyQt6.QtCore import QItemSelection, pyqtSlot
 from PyQt6.QtGui import QFileSystemModel
-from PyQt6.QtWidgets import QFileDialog, QPushButton, QLineEdit, QTreeView
+from PyQt6.QtWidgets import QFileDialog, QLineEdit, QPushButton, QTreeView


 class EricDirFileDialog(QFileDialog):
--- a/src/eric7/EricWidgets/EricErrorMessage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricErrorMessage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,20 +10,18 @@
 import contextlib

 from PyQt6.QtCore import (
-    qInstallMessageHandler,
+    Q_ARG,
+    QMetaObject,
+    QSettings,
     Qt,
-    Q_ARG,
-    QSettings,
-    QtMsgType,
     QThread,
-    QMetaObject,
+    QtMsgType,
+    qInstallMessageHandler,
 )
-from PyQt6.QtWidgets import QErrorMessage, QDialog
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtWidgets import QDialog, QErrorMessage

 from eric7 import Globals, Preferences, Utilities
-
+from eric7.EricWidgets.EricApplication import ericApp

 _msgHandlerDialog = None
 _origMsgHandler = None
--- a/src/eric7/EricWidgets/EricFileSaveConfirmDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricFileSaveConfirmDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QLineEdit, QVBoxLayout

 from .EricPathPicker import EricPathPicker, EricPathPickerModes
--- a/src/eric7/EricWidgets/EricIconBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricIconBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,16 +9,15 @@

 import contextlib

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QCoreApplication
-from PyQt6.QtGui import QColor, QIcon, QCursor, QPalette
-from PyQt6.QtWidgets import QWidget, QBoxLayout, QWIDGETSIZE_MAX, QMenu
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QColor, QCursor, QIcon, QPalette
+from PyQt6.QtWidgets import QWIDGETSIZE_MAX, QBoxLayout, QMenu, QWidget

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

 from .EricClickableLabel import EricClickableLabel

-from eric7.EricGui import EricPixmapCache
-

 class EricIconBar(QWidget):
     """
--- a/src/eric7/EricWidgets/EricLed.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricLed.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@

 import enum

-from PyQt6.QtCore import pyqtSignal, Qt, QSize, QPoint
-from PyQt6.QtGui import QColor, QRadialGradient, QPalette, QPainter, QBrush
+from PyQt6.QtCore import QPoint, QSize, Qt, pyqtSignal
+from PyQt6.QtGui import QBrush, QColor, QPainter, QPalette, QRadialGradient
 from PyQt6.QtWidgets import QWidget
--- a/src/eric7/EricWidgets/EricLineEdit.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricLineEdit.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,16 +9,16 @@

 import enum

-from PyQt6.QtCore import pyqtSignal, Qt, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSignal
 from PyQt6.QtWidgets import (
-    QLineEdit,
-    QWidget,
+    QApplication,
+    QBoxLayout,
     QHBoxLayout,
-    QBoxLayout,
     QLayout,
-    QApplication,
+    QLineEdit,
+    QSizePolicy,
     QSpacerItem,
-    QSizePolicy,
+    QWidget,
 )
--- a/src/eric7/EricWidgets/EricLineEditButton.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricLineEditButton.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a button class to be used with EricLineEdit.
 """

-from PyQt6.QtCore import Qt, QPoint, QPointF
+from PyQt6.QtCore import QPoint, QPointF, Qt
 from PyQt6.QtGui import QPainter, QPainterPath
 from PyQt6.QtWidgets import QAbstractButton
--- a/src/eric7/EricWidgets/EricListSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricListSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a dialog to select from a list of strings.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractItemView,
     QDialog,
     QDialogButtonBox,
-    QAbstractItemView,
     QListWidgetItem,
 )
--- a/src/eric7/EricWidgets/EricListView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricListView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized list views.
 """

-from PyQt6.QtCore import Qt, QItemSelectionModel
+from PyQt6.QtCore import QItemSelectionModel, Qt
 from PyQt6.QtWidgets import QListView
--- a/src/eric7/EricWidgets/EricMainWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricMainWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a main window class with styling support.
 """

-from PyQt6.QtWidgets import QMainWindow, QStyleFactory, QApplication
+from PyQt6.QtWidgets import QApplication, QMainWindow, QStyleFactory

 from .EricApplication import ericApp
--- a/src/eric7/EricWidgets/EricMapWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricMapWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a base class for showing a document map.
 """

-from PyQt6.QtCore import Qt, QSize, QRect, QCoreApplication
-from PyQt6.QtGui import QColor, QBrush, QPainter
-from PyQt6.QtWidgets import QWidget, QAbstractScrollArea
+from PyQt6.QtCore import QCoreApplication, QRect, QSize, Qt
+from PyQt6.QtGui import QBrush, QColor, QPainter
+from PyQt6.QtWidgets import QAbstractScrollArea, QWidget


 class EricMapWidget(QWidget):
--- a/src/eric7/EricWidgets/EricMessageBox.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricMessageBox.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QMessageBox, QApplication
+from PyQt6.QtWidgets import QApplication, QMessageBox

 ###############################################################################
 ##  Mappings to standard QMessageBox                                         ##
--- a/src/eric7/EricWidgets/EricModelMenu.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricModelMenu.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a menu populated from a QAbstractItemModel.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QModelIndex, QPoint
-from PyQt6.QtGui import QFontMetrics, QDrag, QAction
-from PyQt6.QtWidgets import QMenu, QApplication
+from PyQt6.QtCore import QModelIndex, QPoint, Qt, pyqtSignal
+from PyQt6.QtGui import QAction, QDrag, QFontMetrics
+from PyQt6.QtWidgets import QApplication, QMenu

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/EricWidgets/EricModelToolBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricModelToolBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a tool bar populated from a QAbstractItemModel.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QModelIndex, QPoint, QEvent
+from PyQt6.QtCore import QEvent, QModelIndex, QPoint, Qt, pyqtSignal
 from PyQt6.QtGui import QDrag, QIcon
 from PyQt6.QtWidgets import QApplication, QToolBar, QToolButton
--- a/src/eric7/EricWidgets/EricPassivePopup.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricPassivePopup.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,8 +10,8 @@

 import enum

-from PyQt6.QtCore import pyqtSignal, Qt, QTimer, QPoint, QRect
-from PyQt6.QtWidgets import QFrame, QVBoxLayout, QApplication
+from PyQt6.QtCore import QPoint, QRect, Qt, QTimer, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QFrame, QVBoxLayout


 class EricPassivePopupStyle(enum.Enum):
--- a/src/eric7/EricWidgets/EricPasswordMeter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricPasswordMeter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -94,6 +94,7 @@

 if __name__ == "__main__":
     import sys
+
     from PyQt6.QtWidgets import QApplication

     app = QApplication(sys.argv)
--- a/src/eric7/EricWidgets/EricPathPicker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricPathPicker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,20 +11,20 @@
 import os
 import pathlib

-from PyQt6.QtCore import pyqtSignal, Qt, QCoreApplication, QDir
+from PyQt6.QtCore import QCoreApplication, QDir, Qt, pyqtSignal
 from PyQt6.QtWidgets import (
-    QWidget,
+    QComboBox,
     QHBoxLayout,
-    QToolButton,
+    QLineEdit,
     QSizePolicy,
-    QLineEdit,
-    QComboBox,
+    QToolButton,
+    QWidget,
 )

+from eric7.EricGui import EricPixmapCache
+
 from . import EricFileDialog
-from .EricCompleters import EricFileCompleter, EricDirCompleter
-
-from eric7.EricGui import EricPixmapCache
+from .EricCompleters import EricDirCompleter, EricFileCompleter


 class EricPathPickerModes(enum.Enum):
--- a/src/eric7/EricWidgets/EricPathPickerDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricPathPickerDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter a file system path using a file picker.
 """

-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QVBoxLayout

 from .EricPathPicker import EricPathPicker, EricPathPickerModes
--- a/src/eric7/EricWidgets/EricProcessDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricProcessDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,22 +11,21 @@
 import re

 from PyQt6.QtCore import (
+    QCoreApplication,
     QProcess,
+    QProcessEnvironment,
+    Qt,
     QTimer,
     pyqtSlot,
-    Qt,
-    QCoreApplication,
-    QProcessEnvironment,
 )
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_EricProcessDialog import Ui_EricProcessDialog

-from eric7.Globals import strToQByteArray
-from eric7 import Preferences
-

 class EricProcessDialog(QDialog, Ui_EricProcessDialog):
     """
--- a/src/eric7/EricWidgets/EricSideBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricSideBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,8 +10,8 @@
 import enum
 import json

-from PyQt6.QtCore import pyqtSlot, Qt, QSize
-from PyQt6.QtWidgets import QWidget, QStackedWidget, QBoxLayout
+from PyQt6.QtCore import QSize, Qt, pyqtSlot
+from PyQt6.QtWidgets import QBoxLayout, QStackedWidget, QWidget

 from .EricIconBar import EricIconBar
--- a/src/eric7/EricWidgets/EricSingleApplication.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricSingleApplication.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,13 @@

 import os

+from eric7 import Utilities
 from eric7.EricWidgets.EricApplication import ericApp
-
 from eric7.Toolbox.SingleApplication import (
     SingleApplicationClient,
     SingleApplicationServer,
 )

-from eric7 import Utilities
-
 ###########################################################################
 ## define some module global stuff
 ###########################################################################
--- a/src/eric7/EricWidgets/EricSpellCheckedTextEdit.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricSpellCheckedTextEdit.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,14 +13,15 @@
 try:
     import enchant
     import enchant.tokenize
-    from enchant.errors import TokenizerNotFoundError, DictNotFoundError
+
+    from enchant.errors import DictNotFoundError, TokenizerNotFoundError
     from enchant.utils import trim_suggestions

     ENCHANT_AVAILABLE = True
 except ImportError:
     ENCHANT_AVAILABLE = False

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtGui import (
     QAction,
     QActionGroup,
@@ -29,7 +30,7 @@
     QTextCharFormat,
     QTextCursor,
 )
-from PyQt6.QtWidgets import QMenu, QTextEdit, QPlainTextEdit
+from PyQt6.QtWidgets import QMenu, QPlainTextEdit, QTextEdit

 if ENCHANT_AVAILABLE:

@@ -686,8 +687,9 @@


 if __name__ == "__main__":
+    import os
     import sys
-    import os
+
     from PyQt6.QtWidgets import QApplication

     if ENCHANT_AVAILABLE:
--- a/src/eric7/EricWidgets/EricStringListEditWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricStringListEditWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,13 +8,13 @@
 """

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
-    Qt,
     QSortFilterProxyModel,
     QStringListModel,
+    Qt,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtWidgets import QWidget, QInputDialog, QLineEdit
+from PyQt6.QtWidgets import QInputDialog, QLineEdit, QWidget

 from .Ui_EricStringListEditWidget import Ui_EricStringListEditWidget
--- a/src/eric7/EricWidgets/EricTabWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricTabWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import contextlib

-from PyQt6.QtCore import pyqtSignal, Qt, QPoint, QMimeData
+from PyQt6.QtCore import QMimeData, QPoint, Qt, pyqtSignal
 from PyQt6.QtGui import QDrag
-from PyQt6.QtWidgets import QTabWidget, QTabBar, QApplication, QStyle
+from PyQt6.QtWidgets import QApplication, QStyle, QTabBar, QTabWidget

 from eric7.EricWidgets.EricAnimatedLabel import EricAnimatedLabel
--- a/src/eric7/EricWidgets/EricTableView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricTableView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing specialized table views.
 """

-from PyQt6.QtCore import Qt, QItemSelectionModel
+from PyQt6.QtCore import QItemSelectionModel, Qt
 from PyQt6.QtWidgets import QTableView
--- a/src/eric7/EricWidgets/EricTextEditSearchWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricTextEditSearchWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,17 +9,17 @@

 import enum

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QMetaObject, QSize
-from PyQt6.QtGui import QPalette, QTextDocument, QTextCursor
+from PyQt6.QtCore import QMetaObject, QSize, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QPalette, QTextCursor, QTextDocument
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QCheckBox,
+    QComboBox,
     QHBoxLayout,
     QLabel,
-    QComboBox,
-    QCheckBox,
+    QSizePolicy,
     QToolButton,
-    QSizePolicy,
+    QVBoxLayout,
+    QWidget,
 )

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/EricWidgets/EricTextInputDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricTextInputDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter some text.
 """

-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QLineEdit
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLabel, QLineEdit, QVBoxLayout


 class EricTextInputDialog(QDialog):
--- a/src/eric7/EricWidgets/EricToolBarDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricToolBarDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,24 +7,23 @@
 Module implementing a toolbar configuration dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import (
+    QAbstractButton,
     QDialog,
     QDialogButtonBox,
-    QTreeWidgetItem,
     QInputDialog,
     QLineEdit,
     QListWidgetItem,
-    QAbstractButton,
+    QTreeWidgetItem,
 )

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_EricToolBarDialog import Ui_EricToolBarDialog

-from eric7.EricGui import EricPixmapCache
-

 class EricToolBarItem:
     """
--- a/src/eric7/EricWidgets/EricToolBarManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricToolBarManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a toolbar manager class.
 """

-from PyQt6.QtCore import QObject, QByteArray, QDataStream, QIODevice
+from PyQt6.QtCore import QByteArray, QDataStream, QIODevice, QObject
 from PyQt6.QtWidgets import QToolBar

 from eric7 import Utilities
--- a/src/eric7/EricWidgets/EricToolBox.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricToolBox.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a horizontal and a vertical toolbox class.
 """

-from PyQt6.QtWidgets import QToolBox, QTabWidget
+from PyQt6.QtWidgets import QTabWidget, QToolBox

 from .EricTabWidget import EricTabWidget
--- a/src/eric7/EricWidgets/EricToolButton.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricToolButton.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,14 @@

 import enum

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QTimer, QSize
+from PyQt6.QtCore import QSize, Qt, QTimer, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
-    QToolButton,
-    QStyle,
-    QStyleOptionToolButton,
-    QStyleOption,
     QApplication,
     QLabel,
+    QStyle,
+    QStyleOption,
+    QStyleOptionToolButton,
+    QToolButton,
 )
--- a/src/eric7/EricWidgets/EricTreeWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricTreeWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 import enum

-from PyQt6.QtCore import pyqtSignal, Qt
-from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QAbstractItemView
+from PyQt6.QtCore import Qt, pyqtSignal
+from PyQt6.QtWidgets import QAbstractItemView, QTreeWidget, QTreeWidgetItem


 class EricTreeWidgetItemsState(enum.Enum):
--- a/src/eric7/EricWidgets/EricZoomWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricWidgets/EricZoomWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a zoom widget for the status bar.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal
+from PyQt6.QtCore import pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QWidget

 from .Ui_EricZoomWidget import Ui_EricZoomWidget
--- a/src/eric7/EricXML/MultiProjectReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/MultiProjectReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 import os

+from eric7 import Utilities
+
 from .Config import multiProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7 import Utilities
-

 class MultiProjectReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/PluginRepositoryReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/PluginRepositoryReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module to read the plug-in repository contents file.
 """

+from eric7 import Preferences
+
 from .Config import pluginRepositoryFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7 import Preferences
-

 class PluginRepositoryReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/ProjectReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/ProjectReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a class for reading an XML project file.
 """

+from eric7 import Utilities
+
 from .Config import projectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7 import Utilities
-

 class ProjectReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/SpellCheckDictionariesReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/SpellCheckDictionariesReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module to read the web browser spell check dictionaries list file.
 """

+from eric7 import Preferences
+
 from .Config import dictionariesListFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7 import Preferences
-

 class SpellCheckDictionariesReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/TasksReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/TasksReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,16 @@
 Module implementing a class for reading an XML tasks file.
 """

+import contextlib
 import time
-import contextlib

+from eric7 import Utilities
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Tasks.Task import TaskPriority, TaskType

 from .Config import tasksFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7.Tasks.Task import TaskType, TaskPriority
-
-from eric7 import Utilities
-

 class TasksReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/UserProjectReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/UserProjectReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a class for reading an XML user project properties file.
 """

+from eric7 import Preferences
+
 from .Config import userProjectFileFormatVersion
 from .XMLStreamReaderBase import XMLStreamReaderBase

-from eric7 import Preferences
-

 class UserProjectReader(XMLStreamReaderBase):
     """
--- a/src/eric7/EricXML/XMLStreamReaderBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/EricXML/XMLStreamReaderBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing a base class for all of eric7s XML stream writers.
 """

+import base64
 import pickle  # secok
-import base64

-from PyQt6.QtCore import QXmlStreamReader, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QXmlStreamReader

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/Globals/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Globals/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,12 +18,12 @@
 import sysconfig

 from PyQt6.QtCore import (
+    QT_VERSION,
     QByteArray,
     QCoreApplication,
     QDir,
     QLibraryInfo,
     QProcess,
-    QT_VERSION,
     qVersion,
 )
--- a/src/eric7/Graphics/ApplicationDiagramBuilder.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/ApplicationDiagramBuilder.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,13 +13,12 @@

 from PyQt6.QtWidgets import QApplication, QInputDialog

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog

 from .UMLDiagramBuilder import UMLDiagramBuilder

-from eric7 import Preferences, Utilities
-

 class ApplicationDiagramBuilder(UMLDiagramBuilder):
     """
--- a/src/eric7/Graphics/AssociationItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/AssociationItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 import enum

-from PyQt6.QtCore import QPointF, QRectF, QLineF
+from PyQt6.QtCore import QLineF, QPointF, QRectF
 from PyQt6.QtWidgets import QGraphicsItem

+from eric7 import Utilities
 from eric7.EricGraphics.EricArrowItem import EricArrowItem, EricArrowType

-from eric7 import Utilities
-

 class AssociationType(enum.Enum):
     """
--- a/src/eric7/Graphics/ClassItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/ClassItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@
 from PyQt6.QtGui import QFont
 from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

-from .UMLItem import UMLModel, UMLItem
+from eric7 import Utilities

-from eric7 import Utilities
+from .UMLItem import UMLItem, UMLModel


 class ClassModel(UMLModel):
--- a/src/eric7/Graphics/ImportsDiagramBuilder.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/ImportsDiagramBuilder.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@

 from PyQt6.QtWidgets import QApplication, QGraphicsTextItem

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog

 from .UMLDiagramBuilder import UMLDiagramBuilder

-from eric7 import Preferences, Utilities
-

 class ImportsDiagramBuilder(UMLDiagramBuilder):
     """
--- a/src/eric7/Graphics/ModuleItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/ModuleItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 from PyQt6.QtGui import QFont
 from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

-from .UMLItem import UMLModel, UMLItem
+from .UMLItem import UMLItem, UMLModel


 class ModuleModel(UMLModel):
--- a/src/eric7/Graphics/PackageDiagramBuilder.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/PackageDiagramBuilder.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,16 +10,16 @@
 import glob
 import os
 import time
+
 from itertools import zip_longest

 from PyQt6.QtWidgets import QApplication, QGraphicsTextItem

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog

 from .UMLDiagramBuilder import UMLDiagramBuilder

-from eric7 import Preferences, Utilities
-

 class PackageDiagramBuilder(UMLDiagramBuilder):
     """
--- a/src/eric7/Graphics/PackageItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/PackageItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtGui import QFont
 from PyQt6.QtWidgets import QGraphicsSimpleTextItem, QStyle

-from .UMLItem import UMLModel, UMLItem
+from eric7 import Utilities

-from eric7 import Utilities
+from .UMLItem import UMLItem, UMLModel


 class PackageModel(UMLModel):
--- a/src/eric7/Graphics/PixmapDiagram.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/PixmapDiagram.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,27 @@
 Module implementing a dialog showing a pixmap.
 """

-from PyQt6.QtCore import Qt, QSize, QEvent, QMarginsF
+from PyQt6.QtCore import QEvent, QMarginsF, QSize, Qt
 from PyQt6.QtGui import (
-    QPalette,
-    QImage,
-    QPixmap,
-    QPainter,
+    QAction,
+    QColor,
     QFont,
-    QColor,
-    QAction,
+    QImage,
     QPageLayout,
+    QPainter,
+    QPalette,
+    QPixmap,
 )
-from PyQt6.QtWidgets import QLabel, QSizePolicy, QScrollArea, QMenu, QToolBar
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtPrintSupport import QPrintDialog, QPrinter
+from PyQt6.QtWidgets import QLabel, QMenu, QScrollArea, QSizePolicy, QToolBar

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config

-from eric7 import Preferences
-

 class PixmapDiagram(EricMainWindow):
     """
--- a/src/eric7/Graphics/SvgDiagram.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/SvgDiagram.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,18 @@
 Module implementing a dialog showing a SVG graphic.
 """

-from PyQt6.QtCore import Qt, QSize, QEvent, QMarginsF
-from PyQt6.QtGui import QPalette, QPainter, QFont, QColor, QAction, QPageLayout
-from PyQt6.QtWidgets import QSizePolicy, QScrollArea, QMenu, QToolBar
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtCore import QEvent, QMarginsF, QSize, Qt
+from PyQt6.QtGui import QAction, QColor, QFont, QPageLayout, QPainter, QPalette
+from PyQt6.QtPrintSupport import QPrintDialog, QPrinter
 from PyQt6.QtSvgWidgets import QSvgWidget
+from PyQt6.QtWidgets import QMenu, QScrollArea, QSizePolicy, QToolBar

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config

-from eric7 import Preferences
-

 class SvgDiagram(EricMainWindow):
     """
--- a/src/eric7/Graphics/UMLClassDiagramBuilder.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/UMLClassDiagramBuilder.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,9 @@
 Module implementing a dialog showing a UML like class diagram.
 """

+import os
+
 from itertools import zip_longest
-import os

 from PyQt6.QtWidgets import QGraphicsTextItem
--- a/src/eric7/Graphics/UMLDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/UMLDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,14 +11,13 @@
 import json
 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtGui import QAction
-from PyQt6.QtWidgets import QToolBar, QGraphicsScene
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from PyQt6.QtWidgets import QGraphicsScene, QToolBar

 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.UI import Config
--- a/src/eric7/Graphics/UMLGraphicsView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/UMLGraphicsView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,23 +9,20 @@

 import pathlib

-from PyQt6.QtCore import pyqtSignal, Qt, QSignalMapper, QEvent, QRectF, QMarginsF
+from PyQt6.QtCore import QEvent, QMarginsF, QRectF, QSignalMapper, Qt, pyqtSignal
 from PyQt6.QtGui import QAction, QPageLayout
-from PyQt6.QtWidgets import QGraphicsView, QToolBar, QDialog
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
+from PyQt6.QtPrintSupport import QPrintDialog, QPrinter
+from PyQt6.QtWidgets import QDialog, QGraphicsView, QToolBar

+from eric7 import Preferences
 from eric7.EricGraphics.EricGraphicsView import EricGraphicsView
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.UI import Config

 from .UMLItem import UMLItem

-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-
-from eric7 import Preferences
-

 class UMLGraphicsView(EricGraphicsView):
     """
@@ -755,10 +752,10 @@
             return False, 0
         self.diagramName = data[0].split(": ", 1)[1].strip()

+        from .AssociationItem import AssociationItem
         from .ClassItem import ClassItem
         from .ModuleItem import ModuleItem
         from .PackageItem import PackageItem
-        from .AssociationItem import AssociationItem

         for linenum, line in enumerate(data[1:], start=1):
             if not line.startswith(("item:", "association:")):
@@ -842,11 +839,11 @@
         @return flag indicating success
         @rtype bool
         """
-        from .UMLItem import UMLItem
+        from .AssociationItem import AssociationItem
         from .ClassItem import ClassItem
         from .ModuleItem import ModuleItem
         from .PackageItem import PackageItem
-        from .AssociationItem import AssociationItem
+        from .UMLItem import UMLItem

         umlItems = {}
--- a/src/eric7/Graphics/UMLItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Graphics/UMLItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the UMLItem base class.
 """

-from PyQt6.QtCore import Qt, QSizeF
+from PyQt6.QtCore import QSizeF, Qt
 from PyQt6.QtGui import QColor, QPen
 from PyQt6.QtWidgets import QGraphicsItem, QGraphicsRectItem, QStyle
--- a/src/eric7/HelpViewer/HelpBookmarksWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/HelpBookmarksWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,7 +12,7 @@
 import json
 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QUrl
+from PyQt6.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QClipboard, QGuiApplication
 from PyQt6.QtWidgets import (
     QAbstractItemView,
@@ -23,10 +23,9 @@
     QMenu,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricFileDialog, EricMessageBox

-from eric7 import Preferences
-
 from .HelpBookmarkPropertiesDialog import HelpBookmarkPropertiesDialog
--- a/src/eric7/HelpViewer/HelpViewerImpl.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/HelpViewerImpl.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the help viewer base class.
 """

-from PyQt6.QtCore import pyqtSignal, QUrl
+from PyQt6.QtCore import QUrl, pyqtSignal


 class HelpViewerImpl:
--- a/src/eric7/HelpViewer/HelpViewerImplQTB.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/HelpViewerImplQTB.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,21 +11,20 @@
 import functools

 from PyQt6.QtCore import (
-    pyqtSlot,
-    Qt,
     QByteArray,
-    QUrl,
-    QEvent,
     QCoreApplication,
+    QEvent,
     QPoint,
+    Qt,
+    QUrl,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QDesktopServices, QImage, QGuiApplication, QClipboard
-from PyQt6.QtWidgets import QTextBrowser, QMenu
-
-from .HelpViewerImpl import HelpViewerImpl
+from PyQt6.QtGui import QClipboard, QDesktopServices, QGuiApplication, QImage
+from PyQt6.QtWidgets import QMenu, QTextBrowser

 from eric7.EricGui import EricPixmapCache

+from .HelpViewerImpl import HelpViewerImpl

 AboutBlank = QCoreApplication.translate(
     "HelpViewer",
--- a/src/eric7/HelpViewer/HelpViewerImplQWE.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/HelpViewerImplQWE.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,17 @@
 import contextlib
 import functools

-from PyQt6.QtCore import pyqtSlot, Qt, QEvent, QTimer, QUrl, QPoint
-from PyQt6.QtGui import QGuiApplication, QClipboard, QContextMenuEvent
-from PyQt6.QtWidgets import QMenu
+from PyQt6.QtCore import QEvent, QPoint, Qt, QTimer, QUrl, pyqtSlot
+from PyQt6.QtGui import QClipboard, QContextMenuEvent, QGuiApplication
+from PyQt6.QtWebEngineCore import QWebEngineNewWindowRequest, QWebEnginePage
 from PyQt6.QtWebEngineWidgets import QWebEngineView
-from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineNewWindowRequest
-
-from .HelpViewerWidget import HelpViewerWidget
-from .HelpViewerImpl import HelpViewerImpl
+from PyQt6.QtWidgets import QMenu

 from eric7.EricGui import EricPixmapCache

+from .HelpViewerImpl import HelpViewerImpl
+from .HelpViewerWidget import HelpViewerWidget
+

 class HelpViewerImplQWE(HelpViewerImpl, QWebEngineView):
     """
--- a/src/eric7/HelpViewer/HelpViewerWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/HelpViewerWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,24 +9,24 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QTimer, QByteArray
+from PyQt6.QtCore import QByteArray, Qt, QTimer, QUrl, pyqtSlot
 from PyQt6.QtGui import QAction, QFont, QFontMetrics
 from PyQt6.QtHelp import QHelpEngine
 from PyQt6.QtWidgets import (
-    QWidget,
+    QAbstractButton,
+    QButtonGroup,
+    QComboBox,
+    QFrame,
     QHBoxLayout,
-    QVBoxLayout,
-    QComboBox,
+    QLabel,
+    QMenu,
+    QProgressBar,
     QSizePolicy,
+    QSplitter,
     QStackedWidget,
     QToolButton,
-    QButtonGroup,
-    QAbstractButton,
-    QMenu,
-    QFrame,
-    QLabel,
-    QProgressBar,
-    QSplitter,
+    QVBoxLayout,
+    QWidget,
 )

 try:
@@ -36,22 +36,20 @@
 except ImportError:
     WEBENGINE_AVAILABLE = False

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricTextEditSearchWidget import (
     EricTextEditSearchWidget,
     EricTextEditType,
 )
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-
-from .OpenPagesWidget import OpenPagesWidget
-from .HelpBookmarksWidget import HelpBookmarksWidget
-
-from eric7.WebBrowser.QtHelp.HelpTocWidget import HelpTocWidget
 from eric7.WebBrowser.QtHelp.HelpIndexWidget import HelpIndexWidget
 from eric7.WebBrowser.QtHelp.HelpSearchWidget import HelpSearchWidget
+from eric7.WebBrowser.QtHelp.HelpTocWidget import HelpTocWidget
+
+from .HelpBookmarksWidget import HelpBookmarksWidget
+from .OpenPagesWidget import OpenPagesWidget


 class HelpViewerWidget(QWidget):
--- a/src/eric7/HelpViewer/OpenPagesWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HelpViewer/OpenPagesWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a widget showing the list of open pages.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QPoint
-from PyQt6.QtGui import QGuiApplication, QClipboard
-from PyQt6.QtWidgets import QListWidget, QAbstractItemView, QMenu
+from PyQt6.QtCore import QPoint, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QClipboard, QGuiApplication
+from PyQt6.QtWidgets import QAbstractItemView, QListWidget, QMenu

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/HexEdit/HexEditChunks.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditChunks.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import sys

-from PyQt6.QtCore import QBuffer, QIODevice, QByteArray
+from PyQt6.QtCore import QBuffer, QByteArray, QIODevice


 class HexEditChunk:
--- a/src/eric7/HexEdit/HexEditGotoWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditGotoWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,14 @@
 Module implementing a movement (goto) widget for the hex editor.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QRegularExpression
+from PyQt6.QtCore import QRegularExpression, Qt, pyqtSlot
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import QWidget

-from .Ui_HexEditGotoWidget import Ui_HexEditGotoWidget
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .Ui_HexEditGotoWidget import Ui_HexEditGotoWidget


 class HexEditGotoWidget(QWidget, Ui_HexEditGotoWidget):
--- a/src/eric7/HexEdit/HexEditMainWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditMainWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,37 +7,34 @@
 Module implementing the hex editor main window.
 """

+import contextlib
 import os
-import contextlib
 import pathlib

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QSize, QCoreApplication, QLocale
-from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtCore import QCoreApplication, QLocale, QSize, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QAction, QKeySequence
 from PyQt6.QtWidgets import (
-    QWhatsThis,
-    QLabel,
-    QWidget,
-    QVBoxLayout,
     QDialog,
     QFrame,
+    QLabel,
     QMenu,
+    QVBoxLayout,
+    QWhatsThis,
+    QWidget,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
-
-from eric7.Globals import strGroup, recentNameHexFiles
-
-from .HexEditWidget import HexEditWidget
-from .HexEditSearchReplaceWidget import HexEditSearchReplaceWidget
-from .HexEditGotoWidget import HexEditGotoWidget
-
-from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.Globals import recentNameHexFiles, strGroup
 from eric7.UI import Config

-from eric7 import Preferences, Utilities
+from .HexEditGotoWidget import HexEditGotoWidget
+from .HexEditSearchReplaceWidget import HexEditSearchReplaceWidget
+from .HexEditWidget import HexEditWidget


 class HexEditMainWindow(EricMainWindow):
--- a/src/eric7/HexEdit/HexEditSearchReplaceWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditSearchReplaceWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a search and replace widget for the hex editor.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QByteArray, QRegularExpression
+from PyQt6.QtCore import QByteArray, QRegularExpression, Qt, pyqtSlot
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import QWidget

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox

-from eric7.EricGui import EricPixmapCache
-

 class HexEditSearchReplaceWidget(QWidget):
     """
--- a/src/eric7/HexEdit/HexEditUndoStack.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditUndoStack.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import enum

-from PyQt6.QtGui import QUndoStack, QUndoCommand
+from PyQt6.QtGui import QUndoCommand, QUndoStack


 class HexEditCommand(enum.Enum):
--- a/src/eric7/HexEdit/HexEditWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/HexEdit/HexEditWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,25 +10,24 @@
 import math

 from PyQt6.QtCore import (
+    QBuffer,
+    QByteArray,
+    QIODevice,
+    QRect,
+    Qt,
+    QTimer,
     pyqtSignal,
     pyqtSlot,
-    Qt,
-    QByteArray,
-    QTimer,
-    QRect,
-    QBuffer,
-    QIODevice,
 )
-from PyQt6.QtGui import QFont, QPalette, QKeySequence, QPainter
+from PyQt6.QtGui import QFont, QKeySequence, QPainter, QPalette
 from PyQt6.QtWidgets import QAbstractScrollArea, QApplication

+from eric7 import Globals
 from eric7.EricWidgets.EricApplication import ericApp

 from .HexEditChunks import HexEditChunks
 from .HexEditUndoStack import HexEditUndoStack

-from eric7 import Globals
-

 class HexEditWidget(QAbstractScrollArea):
     """
--- a/src/eric7/IconEditor/IconEditorGrid.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/IconEditor/IconEditorGrid.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,21 +10,21 @@
 import enum
 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QRect, QSize
+from PyQt6.QtCore import QPoint, QRect, QSize, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import (
+    QBrush,
+    QColor,
+    QCursor,
     QImage,
-    QColor,
+    QPainter,
     QPixmap,
-    qRgba,
-    QPainter,
-    QCursor,
-    QBrush,
-    qGray,
-    qAlpha,
     QUndoCommand,
     QUndoStack,
+    qAlpha,
+    qGray,
+    qRgba,
 )
-from PyQt6.QtWidgets import QWidget, QSizePolicy, QApplication, QDialog
+from PyQt6.QtWidgets import QApplication, QDialog, QSizePolicy, QWidget

 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/IconEditor/IconEditorPalette.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/IconEditor/IconEditorPalette.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,21 +7,21 @@
 Module implementing a palette widget for the icon editor.
 """

-from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtGui import QColor, QPainter, QPixmap
 from PyQt6.QtWidgets import (
-    QWidget,
     QBoxLayout,
+    QColorDialog,
+    QFrame,
+    QGroupBox,
     QLabel,
-    QFrame,
     QPushButton,
+    QRadioButton,
+    QSizePolicy,
+    QSpacerItem,
     QSpinBox,
-    QGroupBox,
     QVBoxLayout,
-    QRadioButton,
-    QSpacerItem,
-    QSizePolicy,
-    QColorDialog,
+    QWidget,
 )
--- a/src/eric7/IconEditor/IconEditorWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/IconEditor/IconEditorWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,24 @@
 Module implementing the icon editor main window.
 """

+import contextlib
 import os
-import contextlib
 import pathlib

-from PyQt6.QtCore import pyqtSignal, Qt, QSize, QSignalMapper, QEvent
-from PyQt6.QtGui import QPalette, QImage, QImageReader, QImageWriter, QKeySequence
-from PyQt6.QtWidgets import QScrollArea, QLabel, QDockWidget, QWhatsThis
+from PyQt6.QtCore import QEvent, QSignalMapper, QSize, Qt, pyqtSignal
+from PyQt6.QtGui import QImage, QImageReader, QImageWriter, QKeySequence, QPalette
+from PyQt6.QtWidgets import QDockWidget, QLabel, QScrollArea, QWhatsThis

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.UI import Config

 from .IconEditorGrid import IconEditorGrid, IconEditorTool

-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-
-from eric7 import Preferences
-

 class IconEditorWindow(EricMainWindow):
     """
--- a/src/eric7/JediInterface/AssistantJedi.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/JediInterface/AssistantJedi.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, QObject
+from PyQt6.QtCore import QObject, pyqtSlot
 from PyQt6.QtWidgets import QMenu

 from eric7 import Preferences
--- a/src/eric7/JediInterface/JediServer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/JediInterface/JediServer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,17 +11,14 @@
 import os
 import uuid

-from PyQt6.QtCore import pyqtSlot, QCoreApplication, QTimer, QThread
-from PyQt6.QtWidgets import QInputDialog, QLineEdit, QDialog
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
-from eric7.EricNetwork.EricJsonServer import EricJsonServer
-
-from eric7.QScintilla.Editor import Editor
+from PyQt6.QtCore import QCoreApplication, QThread, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

 from eric7 import Globals, Preferences
+from eric7.EricNetwork.EricJsonServer import EricJsonServer
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.QScintilla.Editor import Editor

 from .RefactoringPreviewDialog import RefactoringPreviewDialog
--- a/src/eric7/MicroPython/AddEditDevicesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/AddEditDevicesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,15 +8,14 @@
 devices.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtCore import Qt, QUrl, QUrlQuery, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_AddEditDevicesDialog import Ui_AddEditDevicesDialog
+from eric7.UI.Info import BugAddress

 from .MicroPythonDevices import getSupportedDevices
-
-from eric7.UI.Info import BugAddress
+from .Ui_AddEditDevicesDialog import Ui_AddEditDevicesDialog


 class AddEditDevicesDialog(QDialog, Ui_AddEditDevicesDialog):
--- a/src/eric7/MicroPython/CircuitPythonDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/CircuitPythonDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,17 @@
 Module implementing the device interface class for CircuitPython boards.
 """

+import os
 import shutil
-import os

 from PyQt6.QtCore import pyqtSlot

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7 import Preferences, Utilities
-

 class CircuitPythonDevice(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/ConnectionSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/ConnectionSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,13 +8,12 @@
 the attached device.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from . import MicroPythonDevices
 from .Ui_ConnectionSelectionDialog import Ui_ConnectionSelectionDialog

-from . import MicroPythonDevices
-

 class ConnectionSelectionDialog(QDialog, Ui_ConnectionSelectionDialog):
     """
--- a/src/eric7/MicroPython/EspDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/EspDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,18 +8,17 @@
 boards.
 """

-from PyQt6.QtCore import pyqtSlot, QProcess
+from PyQt6.QtCore import QProcess, pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricProcessDialog import EricProcessDialog
-from eric7.EricWidgets.EricApplication import ericApp

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7 import Globals, Preferences
-

 class EspDevice(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/EspFirmwareSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/EspFirmwareSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QRegularExpression
+from PyQt6.QtCore import QRegularExpression, pyqtSlot
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
--- a/src/eric7/MicroPython/GenericMicroPythonDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/GenericMicroPythonDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,12 @@

 import os

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7 import Preferences, Utilities
-

 class GenericMicroPythonDevice(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/MicroPythonCommandsInterface.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonCommandsInterface.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,22 +8,22 @@
 """

 import ast
+import os
 import time
-import os

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
+    QCoreApplication,
+    QEventLoop,
     QObject,
     QThread,
     QTimer,
-    QCoreApplication,
-    QEventLoop,
+    pyqtSignal,
+    pyqtSlot,
 )

-from .MicroPythonSerialPort import MicroPythonSerialPort
+from eric7 import Preferences

-from eric7 import Preferences
+from .MicroPythonSerialPort import MicroPythonSerialPort


 class MicroPythonCommandsInterface(QObject):
--- a/src/eric7/MicroPython/MicroPythonDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,14 +11,12 @@
 import logging
 import os

-from PyQt6.QtCore import pyqtSlot, QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject, pyqtSlot
 from PyQt6.QtWidgets import QInputDialog

-from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-
+from eric7.EricWidgets.EricApplication import ericApp

 SupportedBoards = {
     "esp": {
--- a/src/eric7/MicroPython/MicroPythonFileManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonFileManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,16 +8,16 @@
 """

 import os
+import shutil
 import stat
-import shutil

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject
+from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot

 from .MicroPythonFileSystemUtilities import (
-    mtime2string,
-    mode2string,
     decoratedName,
     listdirStat,
+    mode2string,
+    mtime2string,
 )
--- a/src/eric7/MicroPython/MicroPythonFileManagerWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonFileManagerWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,36 +10,33 @@
 import os
 import shutil

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QTreeWidgetItem,
+    QDialog,
     QHeaderView,
-    QMenu,
     QInputDialog,
     QLineEdit,
-    QDialog,
+    QMenu,
+    QTreeWidgetItem,
+    QWidget,
 )

+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox, EricPathPickerDialog
-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricFileSaveConfirmDialog import confirmOverwrite
-from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_MicroPythonFileManagerWidget import Ui_MicroPythonFileManagerWidget
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog

 from .MicroPythonFileManager import MicroPythonFileManager
 from .MicroPythonFileSystemUtilities import (
-    mtime2string,
-    mode2string,
     decoratedName,
     listdirStat,
+    mode2string,
+    mtime2string,
 )
-
-from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences, Utilities
+from .Ui_MicroPythonFileManagerWidget import Ui_MicroPythonFileManagerWidget


 class MicroPythonFileManagerWidget(QWidget, Ui_MicroPythonFileManagerWidget):
--- a/src/eric7/MicroPython/MicroPythonFileSystemUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonFileSystemUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing some file system utility functions.
 """

-import time
+import os
 import stat
-import os
+import time

 MPY_EPOCH = time.mktime((2000, 1, 1, 0, 0, 0, 0, 1, -1))
 # MPy epoch is 2000-01-01 0:0:0 UTC
--- a/src/eric7/MicroPython/MicroPythonGraphWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonGraphWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,33 +7,33 @@
 Module implementing the MicroPython graph widget.
 """

-from collections import deque
 import bisect
+import contextlib
+import csv
 import os
 import time
-import csv
-import contextlib
+
+from collections import deque

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtCharts import QChart, QChartView, QLineSeries, QValueAxis
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QPainter
 from PyQt6.QtWidgets import (
-    QWidget,
     QHBoxLayout,
-    QVBoxLayout,
-    QToolButton,
+    QLabel,
     QSizePolicy,
     QSpacerItem,
-    QLabel,
     QSpinBox,
+    QToolButton,
+    QVBoxLayout,
+    QWidget,
 )
-from PyQt6.QtCharts import QChartView, QChart, QLineSeries, QValueAxis

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class MicroPythonGraphWidget(QWidget):
     """
--- a/src/eric7/MicroPython/MicroPythonSerialPort.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonSerialPort.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 MicroPython devices.
 """

-from PyQt6.QtCore import QIODevice, QTime, QCoreApplication, QEventLoop
+from PyQt6.QtCore import QCoreApplication, QEventLoop, QIODevice, QTime
 from PyQt6.QtSerialPort import QSerialPort
--- a/src/eric7/MicroPython/MicroPythonWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicroPythonWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,41 +7,37 @@
 Module implementing the MicroPython REPL widget.
 """

+import functools
+import os
 import re
 import time
-import os
-import functools

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QPoint, QEvent
-from PyQt6.QtGui import QColor, QKeySequence, QTextCursor, QBrush, QClipboard
+from PyQt6.QtCore import QEvent, QPoint, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QBrush, QClipboard, QColor, QKeySequence, QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
+    QDialog,
+    QHBoxLayout,
     QMenu,
-    QApplication,
-    QHBoxLayout,
+    QSizePolicy,
     QSpacerItem,
-    QSizePolicy,
     QTextEdit,
     QToolButton,
-    QDialog,
+    QWidget,
 )

-from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricProcessDialog import EricProcessDialog
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences, Utilities
-
+from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
 from eric7.UI.Info import BugAddress

+from . import MicroPythonDevices, UF2FlashDialog
 from .Ui_MicroPythonWidget import Ui_MicroPythonWidget

-from . import MicroPythonDevices
-from . import UF2FlashDialog
-
 try:
     from .MicroPythonGraphWidget import MicroPythonGraphWidget
--- a/src/eric7/MicroPython/MicrobitDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/MicrobitDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,17 +11,16 @@
 import os
 import shutil

-from PyQt6.QtCore import pyqtSlot, QStandardPaths
+from PyQt6.QtCore import QStandardPaths, pyqtSlot
 from PyQt6.QtWidgets import QInputDialog, QLineEdit

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+
 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7 import Preferences, Utilities
-

 class MicrobitDevice(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/PyBoardDevices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/PyBoardDevices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,17 +9,16 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QStandardPaths
+from PyQt6.QtCore import QStandardPaths, pyqtSlot

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricProcessDialog import EricProcessDialog

 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7 import Preferences, Utilities
-

 class PyBoardDevice(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/RP2040Devices.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/RP2040Devices.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+
 from .MicroPythonDevices import MicroPythonDevice
 from .MicroPythonWidget import HAS_QTCHART

-from eric7 import Preferences
-

 class RP2040Device(MicroPythonDevice):
     """
--- a/src/eric7/MicroPython/UF2FlashDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/UF2FlashDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,22 +7,20 @@
 Module implementing a dialog to flash any UF2 capable device.
 """

+import contextlib
 import os
 import shutil
-import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QThread, QEventLoop
+from PyQt6.QtCore import QCoreApplication, QEventLoop, Qt, QThread, pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_UF2FlashDialog import Ui_UF2FlashDialog
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Utilities
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from . import MicroPythonDevices
+from .Ui_UF2FlashDialog import Ui_UF2FlashDialog

 SupportedUF2Boards = {
     "circuitpython": {
--- a/src/eric7/MicroPython/UnknownDevicesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MicroPython/UnknownDevicesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,16 @@
 Module implementing a dialog to manage the list of unknown devices.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtCore import Qt, QUrl, QUrlQuery, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QDialog, QListWidgetItem

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.UI.Info import BugAddress

 from .Ui_UnknownDevicesDialog import Ui_UnknownDevicesDialog

-from eric7 import Preferences
-from eric7.UI.Info import BugAddress
-

 class UnknownDevicesDialog(QDialog, Ui_UnknownDevicesDialog):
     """
--- a/src/eric7/MultiProject/AddProjectDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MultiProject/AddProjectDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_AddProjectDialog import Ui_AddProjectDialog

-from eric7 import Preferences, Utilities
-

 class AddProjectDialog(QDialog, Ui_AddProjectDialog):
     """
--- a/src/eric7/MultiProject/MultiProject.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MultiProject/MultiProject.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,23 @@
 Module implementing the multi project management functionality.
 """

+import contextlib
 import os
+import pathlib
 import shutil
-import contextlib
-import pathlib

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFile, QIODevice, QObject, QUuid
-from PyQt6.QtWidgets import QMenu, QDialog, QToolBar
+from PyQt6.QtCore import QFile, QIODevice, QObject, QUuid, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QMenu, QToolBar

-from eric7.Globals import recentNameMultiProject
-
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox, EricPathPickerDialog
 from eric7.EricWidgets.EricPathPickerDialog import EricPathPickerModes
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from eric7.EricGui import EricPixmapCache
+from eric7.Globals import recentNameMultiProject
 from eric7.UI import Config

-from eric7 import Preferences, Utilities
-
 from .MultiProjectFile import MultiProjectFile
--- a/src/eric7/MultiProject/MultiProjectBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MultiProject/MultiProjectBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,15 @@
 Module implementing the multi project browser.
 """

+import glob
 import os
-import glob

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QTreeWidget, QTreeWidgetItem, QDialog, QMenu
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtWidgets import QDialog, QMenu, QTreeWidget, QTreeWidgetItem

 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp


 class MultiProjectBrowser(QTreeWidget):
--- a/src/eric7/MultiProject/MultiProjectFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/MultiProject/MultiProjectFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,10 +14,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
-from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox

 MultiProject = typing.TypeVar("MultiProject")
--- a/src/eric7/Network/IRC/IrcChannelWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcChannelWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,41 +7,38 @@
 Module implementing the IRC channel widget.
 """

-from itertools import zip_longest
-
 import pathlib
 import re

+from itertools import zip_longest
+
 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
+    QCoreApplication,
     QDateTime,
     QPoint,
     QTimer,
     QUrl,
-    QCoreApplication,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QIcon, QPainter, QTextCursor, QDesktopServices
+from PyQt6.QtGui import QDesktopServices, QIcon, QPainter, QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
-    QListWidgetItem,
-    QMenu,
     QApplication,
     QInputDialog,
     QLineEdit,
+    QListWidgetItem,
+    QMenu,
+    QWidget,
 )

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_IrcChannelWidget import Ui_IrcChannelWidget
+from eric7.UI.Info import Copyright, Version

-from .IrcUtilities import ircFilter, ircTimestamp, getChannelModesDict
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-
-from eric7.UI.Info import Version, Copyright
+from .IrcUtilities import getChannelModesDict, ircFilter, ircTimestamp
+from .Ui_IrcChannelWidget import Ui_IrcChannelWidget


 class IrcUserItem(QListWidgetItem):
--- a/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,17 +9,15 @@

 import copy

-from PyQt6.QtCore import pyqtSlot, Qt, QEvent, QItemSelectionModel
+from PyQt6.QtCore import QEvent, QItemSelectionModel, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

-from eric7.EricWidgets import EricMessageBox
-
-from .Ui_IrcIdentitiesEditDialog import Ui_IrcIdentitiesEditDialog
-
-from .IrcNetworkManager import IrcIdentity
-
 from eric7 import Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+
+from .IrcNetworkManager import IrcIdentity
+from .Ui_IrcIdentitiesEditDialog import Ui_IrcIdentitiesEditDialog


 class IrcIdentitiesEditDialog(QDialog, Ui_IrcIdentitiesEditDialog):
--- a/src/eric7/Network/IRC/IrcNetworkEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcNetworkEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_IrcNetworkEditDialog import Ui_IrcNetworkEditDialog

-from eric7.EricGui import EricPixmapCache
-

 class IrcNetworkEditDialog(QDialog, Ui_IrcNetworkEditDialog):
     """
--- a/src/eric7/Network/IRC/IrcNetworkManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcNetworkManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import copy

-from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal

 from eric7 import Preferences, Utilities
 from eric7.Utilities.AutoSaver import AutoSaver
--- a/src/eric7/Network/IRC/IrcNetworkWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcNetworkWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,20 +9,18 @@

 import pathlib

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, QPoint, QUrl, QThread
+from PyQt6.QtCore import QPoint, QThread, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWidgets import QWidget, QApplication, QMenu
+from PyQt6.QtWidgets import QApplication, QMenu, QWidget

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

+from .IrcUtilities import ircFilter, ircTimestamp
 from .Ui_IrcNetworkWidget import Ui_IrcNetworkWidget

-from .IrcUtilities import ircFilter, ircTimestamp
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-

 class IrcNetworkWidget(QWidget, Ui_IrcNetworkWidget):
     """
--- a/src/eric7/Network/IRC/IrcUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 import re

-from PyQt6.QtCore import QTime, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QTime
 from PyQt6.QtWidgets import QApplication

 from eric7 import Preferences, Utilities

-
 __UrlRe = re.compile(
     r"""((?:http|ftp|https):\/\/[\w\-_]+(?:\.[\w\-_]+)+"""
     r"""(?:[\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?)"""
--- a/src/eric7/Network/IRC/IrcWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Network/IRC/IrcWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,16 @@
 Module implementing the IRC window.
 """

+import logging
 import re
-import logging

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QTimer, QDateTime
-from PyQt6.QtWidgets import QWidget, QToolButton, QLabel, QTabWidget
-from PyQt6.QtNetwork import QTcpSocket, QAbstractSocket
+from PyQt6.QtCore import QByteArray, QDateTime, Qt, QTimer, pyqtSignal, pyqtSlot
+from PyQt6.QtNetwork import QAbstractSocket, QTcpSocket
+from PyQt6.QtWidgets import QLabel, QTabWidget, QToolButton, QWidget

 try:
-    from PyQt6.QtNetwork import QSslSocket, QSslConfiguration
+    from PyQt6.QtNetwork import QSslConfiguration, QSslSocket
+
     from eric7.EricNetwork.EricSslErrorHandler import (
         EricSslErrorHandler,
         EricSslErrorState,
@@ -25,17 +26,14 @@
 except ImportError:
     SSL_AVAILABLE = False

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import isMacPlatform
+from eric7.UI.Info import Copyright, Version

 from .Ui_IrcWidget import Ui_IrcWidget

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Globals import isMacPlatform
-
-from eric7.UI.Info import Version, Copyright
-

 class IrcWidget(QWidget, Ui_IrcWidget):
     """
--- a/src/eric7/PipInterface/Pip.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/Pip.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,21 +7,20 @@
 Package implementing the pip GUI logic.
 """

+import contextlib
+import json
 import os
 import sys
-import json
-import contextlib

-from PyQt6.QtCore import pyqtSlot, QObject, QProcess, QUrl, QCoreApplication, QThread
+from PyQt6.QtCore import QCoreApplication, QObject, QProcess, QThread, QUrl, pyqtSlot
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit
-from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply

 from eric7 import Globals, Preferences
+from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
-
 try:
     from eric7.EricNetwork.EricSslErrorHandler import EricSslErrorHandler
--- a/src/eric7/PipInterface/PipDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a dialog showing the output of a pip command.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QTimer, QProcess
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import QCoreApplication, QProcess, Qt, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_PipDialog import Ui_PipDialog

-from eric7 import Preferences
-

 class PipDialog(QDialog, Ui_PipDialog):
     """
--- a/src/eric7/PipInterface/PipFileSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipFileSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_PipFileSelectionDialog import Ui_PipFileSelectionDialog

-from eric7 import Utilities
-

 class PipFileSelectionDialog(QDialog, Ui_PipFileSelectionDialog):
     """
--- a/src/eric7/PipInterface/PipFreezeDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipFreezeDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,18 +10,17 @@
 import enum
 import os

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, QApplication
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QApplication, QDialog, QDialogButtonBox

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Utilities
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .Ui_PipFreezeDialog import Ui_PipFreezeDialog

-from eric7 import Utilities
-

 class PipFreezeDialogModes(enum.Enum):
     """
--- a/src/eric7/PipInterface/PipLicensesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipLicensesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os
 import re

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
--- a/src/eric7/PipInterface/PipPackageDetailsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipPackageDetailsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,14 @@
 Module implementing a dialog to show details about a package.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QLocale
+from PyQt6.QtCore import QLocale, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractButton,
     QDialog,
     QDialogButtonBox,
-    QTreeWidgetItem,
+    QHeaderView,
     QLabel,
-    QHeaderView,
-    QAbstractButton,
+    QTreeWidgetItem,
 )

 from .Ui_PipPackageDetailsDialog import Ui_PipPackageDetailsDialog
--- a/src/eric7/PipInterface/PipPackagesWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipPackagesWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,37 +7,35 @@
 Module implementing the pip packages management widget.
 """

-import textwrap
+import contextlib
+import html.parser
 import os
-import html.parser
-import contextlib
+import textwrap

 from packaging.specifiers import SpecifierSet
-
-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QUrlQuery
+from PyQt6.QtCore import Qt, QUrl, QUrlQuery, pyqtSlot
 from PyQt6.QtGui import QIcon
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import (
-    QWidget,
-    QToolButton,
+    QAbstractItemView,
     QApplication,
+    QDialog,
     QHeaderView,
+    QMenu,
+    QToolButton,
     QTreeWidgetItem,
-    QMenu,
-    QDialog,
-    QAbstractItemView,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
+from eric7 import Globals, Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets.EricApplication import ericApp

 from .PipVulnerabilityChecker import Package, VulnerabilityCheckError
 from .Ui_PipPackagesWidget import Ui_PipPackagesWidget

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences
-

 class PypiSearchResultsParser(html.parser.HTMLParser):
     """
--- a/src/eric7/PipInterface/PipVulnerabilityChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PipInterface/PipVulnerabilityChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,17 +16,16 @@
 import json
 import os
 import time
+
 from dataclasses import dataclass

 from packaging.specifiers import SpecifierSet
-
 from PyQt6.QtCore import QCoreApplication, QObject, QThread, QUrl
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Globals, Preferences
-

 @dataclass
 class Package:
--- a/src/eric7/PluginManager/PluginDetailsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginDetailsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the Plugin Details Dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog

 from .Ui_PluginDetailsDialog import Ui_PluginDetailsDialog
--- a/src/eric7/PluginManager/PluginInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the Plugin Info Dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QBrush
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView, QMenu
+from PyQt6.QtWidgets import QDialog, QHeaderView, QMenu, QTreeWidgetItem

 from .Ui_PluginInfoDialog import Ui_PluginInfoDialog
--- a/src/eric7/PluginManager/PluginInstallDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginInstallDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,25 +18,23 @@
 import urllib.parse
 import zipfile

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QDialogButtonBox,
     QAbstractButton,
     QApplication,
     QDialog,
+    QDialogButtonBox,
     QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.Utilities.uic import compileUiFiles

 from .Ui_PluginInstallDialog import Ui_PluginInstallDialog

-from eric7 import Preferences, Utilities
-
-from eric7.Utilities.uic import compileUiFiles
-

 class PluginInstallWidget(QWidget, Ui_PluginInstallDialog):
     """
--- a/src/eric7/PluginManager/PluginManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,25 @@
 Module implementing the Plugin Manager.
 """

-import os
-import sys
-import zipfile
-import types
-import importlib
 import contextlib
 import datetime
+import importlib
+import os
 import pathlib
+import sys
+import types
+import zipfile

-from PyQt6.QtCore import pyqtSignal, QObject, QFile, QUrl, QIODevice
+from PyQt6.QtCore import QFile, QIODevice, QObject, QUrl, pyqtSignal
 from PyQt6.QtGui import QPixmap
-from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest

+from eric7 import Globals, Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences, Utilities
-from eric7.Globals import getConfig
+from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
+from eric7.Globals import getConfig

 try:
     from eric7.EricNetwork.EricSslErrorHandler import (
@@ -39,12 +38,12 @@
     SSL_AVAILABLE = False

 from .PluginExceptions import (
-    PluginPathError,
-    PluginModulesError,
+    PluginActivationError,
+    PluginClassFormatError,
     PluginLoadError,
-    PluginActivationError,
     PluginModuleFormatError,
-    PluginClassFormatError,
+    PluginModulesError,
+    PluginPathError,
 )
--- a/src/eric7/PluginManager/PluginRepositoryDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginRepositoryDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,49 +7,48 @@
 Module implementing a dialog showing the available plugins.
 """

+import glob
 import os
+import re
 import zipfile
-import glob
-import re

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
-    Qt,
+    QCoreApplication,
     QFile,
     QIODevice,
-    QUrl,
+    QPoint,
     QProcess,
-    QPoint,
-    QCoreApplication,
-)
-from PyQt6.QtWidgets import (
-    QWidget,
-    QDialogButtonBox,
-    QAbstractButton,
-    QTreeWidgetItem,
-    QDialog,
-    QVBoxLayout,
-    QHBoxLayout,
-    QMenu,
-    QLabel,
-    QToolButton,
+    Qt,
+    QUrl,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtNetwork import (
     QNetworkAccessManager,
-    QNetworkRequest,
+    QNetworkInformation,
     QNetworkReply,
-    QNetworkInformation,
+    QNetworkRequest,
+)
+from PyQt6.QtWidgets import (
+    QAbstractButton,
+    QDialog,
+    QDialogButtonBox,
+    QHBoxLayout,
+    QLabel,
+    QMenu,
+    QToolButton,
+    QTreeWidgetItem,
+    QVBoxLayout,
+    QWidget,
 )

 from eric7 import Globals, Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
-from eric7.Globals import getConfig
+from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
+from eric7.Globals import getConfig

 try:
     from eric7.EricNetwork.EricSslErrorHandler import (
--- a/src/eric7/PluginManager/PluginUninstallDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/PluginManager/PluginUninstallDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,23 +7,22 @@
 Module implementing a dialog for plugin deinstallation.
 """

-import sys
-import os
+import glob
 import importlib
+import os
 import shutil
-import glob
+import sys

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt6.QtWidgets import QWidget, QDialog, QVBoxLayout, QListWidgetItem
-
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_PluginUninstallDialog import Ui_PluginUninstallDialog
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QListWidgetItem, QVBoxLayout, QWidget

 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+
+from .Ui_PluginUninstallDialog import Ui_PluginUninstallDialog


 class PluginUninstallWidget(QWidget, Ui_PluginUninstallDialog):
--- a/src/eric7/Plugins/AboutPlugin/AboutDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/AboutPlugin/AboutDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,14 @@
 Module implementing an 'About Eric' dialog.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog

-from .Ui_AboutDialog import Ui_AboutDialog
-
 from eric7 import Preferences
-
 from eric7.EricGui import EricPixmapCache
 from eric7.UI import Info

+from .Ui_AboutDialog import Ui_AboutDialog

 titleText = "<b>{0} - {1}</b>".format(Info.Program, Info.Version)
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Annotations/AnnotationsChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,12 +11,13 @@
 import contextlib
 import copy
 import sys
+
 from functools import lru_cache

 import AstUtilities

+from .AnnotationsCheckerDefaults import AnnotationsCheckerDefaultArgs
 from .AnnotationsEnums import AnnotationType, ClassDecoratorType, FunctionType
-from .AnnotationsCheckerDefaults import AnnotationsCheckerDefaultArgs


 class AnnotationsChecker:
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/AstUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/AstUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 the ast module.
 """

+import ast
 import sys
-import ast

 if sys.version_info >= (3, 8, 0):
     # functions for Python >= 3.8
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the code style checker.
 """

+import ast
+import contextlib
+import multiprocessing
 import queue
-import ast
 import sys
-import multiprocessing
-import contextlib

 import pycodestyle
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,33 +14,29 @@
 import os
 import time

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, QTimer, pyqtSlot
 from PyQt6.QtGui import QIcon
 from PyQt6.QtWidgets import (
+    QAbstractButton,
+    QApplication,
     QDialog,
-    QTreeWidgetItem,
-    QAbstractButton,
     QDialogButtonBox,
-    QApplication,
-    QListWidgetItem,
     QInputDialog,
     QLineEdit,
+    QListWidgetItem,
+    QTreeWidgetItem,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

+from . import CodeStyleCheckerUtilities, pycodestyle
+from .Annotations.AnnotationsCheckerDefaults import AnnotationsCheckerDefaultArgs
+from .Miscellaneous.MiscellaneousDefaults import MiscellaneousCheckerDefaultArgs
+from .Security.SecurityDefaults import SecurityDefaults
 from .Ui_CodeStyleCheckerDialog import Ui_CodeStyleCheckerDialog

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-
-from . import pycodestyle
-from . import CodeStyleCheckerUtilities
-
-from .Miscellaneous.MiscellaneousDefaults import MiscellaneousCheckerDefaultArgs
-from .Annotations.AnnotationsCheckerDefaults import AnnotationsCheckerDefaultArgs
-from .Security.SecurityDefaults import SecurityDefaults
-

 class CodeStyleCheckerDialog(QDialog, Ui_CodeStyleCheckerDialog):
     """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCodeSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,11 +12,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

-from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog
-
+from . import CodeStyleCheckerUtilities
 from .translations import getMessageCodes, getTranslatedMessage
-
-from . import CodeStyleCheckerUtilities
+from .Ui_CodeStyleCodeSelectionDialog import Ui_CodeStyleCodeSelectionDialog


 class CodeStyleCodeSelectionDialog(QDialog, Ui_CodeStyleCodeSelectionDialog):
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,11 @@
 Module implementing a class to fix certain code style issues.
 """

+import contextlib
 import os
 import re
 import tokenize
-import contextlib
+
 from io import StringIO

 # CodeStyleCheckerDialog tries to import FixableCodeStyleIssues which fails
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleStatisticsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,8 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

+from . import CodeStyleCheckerUtilities
 from .translations import getTranslatedMessage
-
-from . import CodeStyleCheckerUtilities
-
 from .Ui_CodeStyleStatisticsDialog import Ui_CodeStyleStatisticsDialog
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/ComplexityChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Complexity/ComplexityChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a checker for code complexity.
 """

+import ast
 import copy
-import ast

 from .mccabe import PathGraphingAstVisitor
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/DocStyleChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/DocStyle/DocStyleChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,11 @@
 # pep257.py (version 0.2.4).
 #

+import ast
+import contextlib
 import tokenize
-import ast
+
 from io import StringIO
-import contextlib

 try:
     ast.AsyncFunctionDef  # __IGNORE_EXCEPTION__
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportNode.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Imports/ImportNode.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,6 +12,7 @@
 #

 import ast
+
 from functools import total_ordering

 from .ImportsEnums import GroupEnum, NodeTypeEnum
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Miscellaneous/MiscellaneousChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,6 +15,7 @@
 import re
 import sys
 import tokenize
+
 from collections import defaultdict, namedtuple
 from keyword import iskeyword
 from string import Formatter
@@ -22,7 +23,6 @@
 import AstUtilities

 from .eradicate import Eradicator
-
 from .MiscellaneousDefaults import MiscellaneousCheckerDefaultArgs
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/PathlibChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/PathLib/PathlibChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@
 """

 import ast
+import contextlib
 import copy
-import contextlib


 class PathlibChecker:
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/awsHardcodedPassword.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/awsHardcodedPassword.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,11 +16,12 @@
 # Original License: GPLv3
 #

-from collections import Counter
 import math
 import re
 import string

+from collections import Counter
+

 def getChecks():
     """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureHashlibNew.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/Checks/insecureHashlibNew.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,6 +10,8 @@

 import sys

+from Security.SecurityDefaults import SecurityDefaults
+
 #
 # This is a modified version of the one found in the bandit package.
 #
@@ -18,8 +20,6 @@
 # SPDX-License-Identifier: Apache-2.0
 #

-from Security.SecurityDefaults import SecurityDefaults
-

 def getChecks():
     """
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the security checker.
 """

+import collections
 import copy
-import collections

 from . import Checks
 from .SecurityNodeVisitor import SecurityNodeVisitor
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityUtils.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/Security/SecurityUtils.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 """

 import ast
+import contextlib
 import os
-import contextlib

 import AstUtilities
--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/translations.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing message translations for the code style plugin messages.
 """

+import contextlib
 import re
-import contextlib

 from PyQt6.QtCore import QCoreApplication
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheck.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,16 @@
 Module implementing the syntax check for Python 3.
 """

+import ast
+import contextlib
+import multiprocessing
 import queue
-import ast
 import re
 import traceback
-import multiprocessing
-import contextlib

 with contextlib.suppress(ImportError):
     from pyflakes.checker import Checker
-    from pyflakes.messages import ImportStarUsed, ImportStarUsage
+    from pyflakes.messages import ImportStarUsage, ImportStarUsed

 VcsConflictMarkerRegExpList = (
     re.compile(
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,22 +11,21 @@
 import os
 import time

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtCore import Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
-    QApplication,
-    QHeaderView,
 )

+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_SyntaxCheckerDialog import Ui_SyntaxCheckerDialog

-from eric7 import Utilities
-from eric7.EricGui import EricPixmapCache
-

 class SyntaxCheckerDialog(QDialog, Ui_SyntaxCheckerDialog):
     """
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsCheckSyntax.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing the syntax check for JavaScript.
 """

-import queue
+import multiprocessing
 import os
+import queue
 import sys
-import multiprocessing


 def initService():
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/jsonCheckSyntax.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the syntax check for JSON.
 """

+import multiprocessing
 import queue
-import multiprocessing


 def initService():
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/tomlCheckSyntax.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the syntax check for TOML.
 """

+import multiprocessing
 import queue
-import multiprocessing


 def initService():
@@ -176,7 +176,8 @@
     """
     try:
         import tomlkit
-        from tomlkit.exceptions import ParseError, KeyAlreadyPresent
+
+        from tomlkit.exceptions import KeyAlreadyPresent, ParseError
     except ImportError:
         error = "tomlkit not available. Install it via the PyPI interface."
         return [{"error": (file, 0, 0, "", error)}]
--- a/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/SyntaxChecker/yamlCheckSyntax.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the syntax check for YAML.
 """

+import multiprocessing
 import queue
-import multiprocessing


 def initService():
@@ -175,7 +175,7 @@
     @rtype dict
     """
     try:
-        from yaml import safe_load_all, MarkedYAMLError
+        from yaml import MarkedYAMLError, safe_load_all
     except ImportError:
         error = "pyyaml not available. Install it via the PyPI interface."
         return [{"error": (file, 0, 0, "", error)}]
--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,18 @@
 Module implementing a dialog to enter the parameters for eric7_api.
 """

+import copy
 import os
-import copy

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import DocumentationTools, Globals, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import getConfig

 from .Ui_EricapiConfigDialog import Ui_EricapiConfigDialog

-from eric7 import DocumentationTools, Globals, Utilities
-
-from eric7.Globals import getConfig
-

 class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog):
     """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,11 @@
 from PyQt6.QtCore import QProcess, QTimer
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_EricapiExecDialog import Ui_EricapiExecDialog

-from eric7 import Preferences
-

 class EricapiExecDialog(QDialog, Ui_EricapiExecDialog):
     """
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,24 +7,22 @@
 Module implementing a dialog to enter the parameters for eric7_doc.
 """

+import copy
 import os
-import copy

 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QColor
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QColorDialog
+from PyQt6.QtWidgets import QColorDialog, QDialog, QDialogButtonBox

+from eric7 import Globals, Utilities
+from eric7.DocumentationTools.Config import (
+    eric7docColorParameterNames,
+    eric7docDefaultColors,
+)
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import getConfig

 from .Ui_EricdocConfigDialog import Ui_EricdocConfigDialog
-from eric7.DocumentationTools.Config import (
-    eric7docDefaultColors,
-    eric7docColorParameterNames,
-)
-
-from eric7 import Globals, Utilities
-
-from eric7.Globals import getConfig


 class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog):
--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,11 @@
 from PyQt6.QtCore import QProcess, QTimer
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_EricdocExecDialog import Ui_EricdocExecDialog

-from eric7 import Preferences
-

 class EricdocExecDialog(QDialog, Ui_EricdocExecDialog):
     """
--- a/src/eric7/Plugins/PluginAbout.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginAbout.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,10 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtGui import QAction

-from eric7.UI import Info
 from eric7.EricGui import EricPixmapCache
-
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
+from eric7.UI import Info

 # Start-Of-Header
 name = "About Plugin"
--- a/src/eric7/Plugins/PluginCodeStyleChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginCodeStyleChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,19 +7,18 @@
 Module implementing the code style checker plug-in.
 """

+import contextlib
 import os
 import textwrap
-import contextlib

-from PyQt6.QtCore import QObject, pyqtSignal, QCoreApplication
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricAction import EricAction
-from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-from eric7.Utilities import determinePythonVersion
+from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal

 from eric7 import Preferences
+from eric7.EricGui.EricAction import EricAction
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
 from eric7.UI import Info
+from eric7.Utilities import determinePythonVersion

 # Start-Of-Header
 name = "Code Style Checker Plugin"
--- a/src/eric7/Plugins/PluginEricapi.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginEricapi.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,15 @@

 import os

-from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7 import Utilities
 from eric7.EricGui.EricAction import EricAction
-
-from eric7 import Utilities
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import getConfig
 from eric7.UI import Info

-from eric7.Globals import getConfig
-
 # Start-Of-Header
 name = "Ericapi Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
--- a/src/eric7/Plugins/PluginEricdoc.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginEricdoc.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,15 @@

 import os

-from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7 import Utilities
 from eric7.EricGui.EricAction import EricAction
-
-from eric7 import Utilities
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import getConfig
 from eric7.UI import Info

-from eric7.Globals import getConfig
-
 # Start-Of-Header
 name = "Ericdoc Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
--- a/src/eric7/Plugins/PluginSyntaxChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginSyntaxChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,16 @@
 Module implementing the Syntax Checker plugin.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import QObject

+from eric7 import Preferences
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
-
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-
-from eric7 import Preferences
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginTranslator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginTranslator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,11 @@

 import os

-from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QCoreApplication, QObject, pyqtSignal

 from eric7 import Preferences
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.UiExtensionPlugins.Translator.Translator import Translator
-
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginVcsGit.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginVcsGit.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,19 +7,15 @@
 Module implementing the Git version control plugin.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import QObject, QCoreApplication, QByteArray
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QByteArray, QCoreApplication, QObject

 from eric7 import Preferences, Utilities
-
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath
 from eric7.Preferences.Shortcuts import readShortcuts
-
-from eric7.Plugins.VcsPlugins.vcsGit.GitUtilities import getConfigPath
-
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginVcsMercurial.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginVcsMercurial.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,22 +7,18 @@
 Module implementing the Mercurial version control plugin.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import QObject, QCoreApplication, QByteArray
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QByteArray, QCoreApplication, QObject

 from eric7 import Preferences, Utilities
-
-from eric7.Preferences.Shortcuts import readShortcuts
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsMercurial.HgUtilities import (
     getConfigPath,
     getHgExecutable,
 )
-
+from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginVcsPySvn.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginVcsPySvn.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,19 +7,17 @@
 Module implementing the PySvn version control plugin.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import QObject, QCoreApplication
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QCoreApplication, QObject

 from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Plugins.VcsPlugins.vcsPySvn.SvnUtilities import getConfigPath, getServersPath
 from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.UI import Info

-from eric7.Plugins.VcsPlugins.vcsPySvn.SvnUtilities import getConfigPath, getServersPath
-
 # Start-Of-Header
 name = "PySvn Plugin"
 author = "Detlev Offenbach <detlev@die-offenbachs.de>"
--- a/src/eric7/Plugins/PluginVcsSubversion.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginVcsSubversion.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,21 +7,18 @@
 Module implementing the Subversion version control plugin.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import QObject, QCoreApplication
-
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QCoreApplication, QObject

 from eric7 import Preferences, Utilities
-from eric7.Preferences.Shortcuts import readShortcuts
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Plugins.VcsPlugins.vcsSubversion.SvnUtilities import (
     getConfigPath,
     getServersPath,
 )
-
+from eric7.Preferences.Shortcuts import readShortcuts
 from eric7.UI import Info

 # Start-Of-Header
@@ -113,8 +110,7 @@
     @return reference to the configuration page
     """
     global subversionCfgPluginObject
-    from eric7.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import (
-        # __IGNORE_WARNING__
+    from eric7.Plugins.VcsPlugins.vcsSubversion.ConfigurationPage.SubversionPage import (  # __IGNORE_WARNING__
         SubversionPage,
     )
--- a/src/eric7/Plugins/PluginWizardDotDesktop.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardDotDesktop.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-of-Header
@@ -137,8 +136,7 @@
                     ericApp().getObject("ViewManager").newEditor()
                     editor = ericApp().getObject("ViewManager").activeWindow()

-            from eric7.Plugins.WizardPlugins.DotDesktopWizard.DotDesktopWizardDialog import (
-                # __IGNORE_WARNING__
+            from eric7.Plugins.WizardPlugins.DotDesktopWizard.DotDesktopWizardDialog import (  # __IGNORE_WARNING__
                 DotDesktopWizardDialog,
             )
--- a/src/eric7/Plugins/PluginWizardEricMessageBox.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardEricMessageBox.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -106,8 +105,7 @@
         @param editor reference to the current editor
         @return the generated code (string)
         """
-        from eric7.Plugins.WizardPlugins.EricMessageBoxWizard.EricMessageBoxWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.EricMessageBoxWizard.EricMessageBoxWizardDialog import (  # __IGNORE_WARNING__
             EricMessageBoxWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardEricPlugin.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardEricPlugin.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-of-Header
--- a/src/eric7/Plugins/PluginWizardPyRegExp.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardPyRegExp.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginWizardQColorDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQColorDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -106,8 +105,7 @@
         @param editor reference to the current editor
         @return the generated code (string) and a success flag (boolean)
         """
-        from eric7.Plugins.WizardPlugins.ColorDialogWizard.ColorDialogWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.ColorDialogWizard.ColorDialogWizardDialog import (  # __IGNORE_WARNING__
             ColorDialogWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardQFileDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQFileDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -140,8 +139,7 @@
         @type int
         @return the generated code (string)
         """
-        from eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.FileDialogWizard.FileDialogWizardDialog import (  # __IGNORE_WARNING__
             FileDialogWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardQFontDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQFontDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -106,8 +105,7 @@
         @param editor reference to the current editor
         @return the generated code (string)
         """
-        from eric7.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.FontDialogWizard.FontDialogWizardDialog import (  # __IGNORE_WARNING__
             FontDialogWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardQInputDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQInputDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -106,8 +105,7 @@
         @param editor reference to the current editor
         @return the generated code (string)
         """
-        from eric7.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.InputDialogWizard.InputDialogWizardDialog import (  # __IGNORE_WARNING__
             InputDialogWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardQMessageBox.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQMessageBox.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
@@ -106,8 +105,7 @@
         @param editor reference to the current editor
         @return the generated code (string)
         """
-        from eric7.Plugins.WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog import (
-            # __IGNORE_WARNING__
+        from eric7.Plugins.WizardPlugins.MessageBoxWizard.MessageBoxWizardDialog import (  # __IGNORE_WARNING__
             MessageBoxWizardDialog,
         )
--- a/src/eric7/Plugins/PluginWizardQRegularExpression.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardQRegularExpression.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import QObject
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-Of-Header
--- a/src/eric7/Plugins/PluginWizardSetup.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/PluginWizardSetup.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.UI import Info

 # Start-of-Header
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/ConfigurationPage/TranslatorPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,19 +9,18 @@

 import sys

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QListWidgetItem

 from eric7.EricWidgets import EricMessageBox
-
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
+from .. import TranslatorEngines
+from ..TranslatorLanguagesDb import TranslatorLanguagesDb
 from .Ui_TranslatorPage import Ui_TranslatorPage

-from ..TranslatorLanguagesDb import TranslatorLanguagesDb
-from .. import TranslatorEngines
-

 class TranslatorPage(ConfigurationPageBase, Ui_TranslatorPage):
     """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/Translator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 import os

-from PyQt6.QtCore import Qt, QObject
+from PyQt6.QtCore import QObject, Qt
 from PyQt6.QtGui import QKeySequence

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction

-from eric7.EricGui import EricPixmapCache
-

 class Translator(QObject):
     """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/DeepLEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import json

-from PyQt6.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QByteArray, QTimer, QUrl

 from eric7 import Utilities
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV1Engine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import json
 import re

-from PyQt6.QtCore import QByteArray, QUrl, QTimer
+from PyQt6.QtCore import QByteArray, QTimer, QUrl

 from eric7 import Utilities
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/GoogleV2Engine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.QtCore import QByteArray, QTimer, QUrl

-from .TranslationEngine import TranslationEngine
+from eric7 import Utilities

-from eric7 import Utilities
+from .TranslationEngine import TranslationEngine


 class GoogleV2Engine(TranslationEngine):
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/IbmWatsonEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 import json

-from PyQt6.QtCore import QUrl, QByteArray, QTimer
-from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtCore import QByteArray, QTimer, QUrl
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest

 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
+from eric7.EricWidgets import EricMessageBox

 from .TranslationEngine import TranslationEngine
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MicrosoftEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import json

-from PyQt6.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QByteArray, QTimer, QUrl

 from .TranslationEngine import TranslationEngine
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/MyMemoryEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import json

-from PyQt6.QtCore import QUrl, QTimer
+from PyQt6.QtCore import QTimer, QUrl

 from .TranslationEngine import TranslationEngine
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/TranslationEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import QObject, pyqtSignal


 class TranslationEngine(QObject):
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/YandexEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import json

-from PyQt6.QtCore import QUrl, QByteArray, QTimer
+from PyQt6.QtCore import QByteArray, QTimer, QUrl

 from eric7 import Utilities
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@
 from PyQt6.QtCore import QCoreApplication
 from PyQt6.QtGui import QIcon

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricGui import EricPixmapCache
-

 def supportedEngineNames():
     """
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 requests.
 """

-from PyQt6.QtCore import QObject, QEventLoop, QByteArray
-from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
+from PyQt6.QtCore import QByteArray, QEventLoop, QObject
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest

 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
--- a/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,28 +9,26 @@

 import sys

-from PyQt6.QtCore import pyqtSlot, QTemporaryFile
+from PyQt6.QtCore import QTemporaryFile, pyqtSlot
 from PyQt6.QtWidgets import QWidget

 if "--no-multimedia" in sys.argv:
     MULTIMEDIA_AVAILABLE = False
 else:
     try:
-        from PyQt6.QtMultimedia import QMediaFormat, QMediaPlayer, QAudioOutput
+        from PyQt6.QtMultimedia import QAudioOutput, QMediaFormat, QMediaPlayer

         MULTIMEDIA_AVAILABLE = True
     except ImportError:
         MULTIMEDIA_AVAILABLE = False

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from .Ui_TranslatorWidget import Ui_TranslatorWidget
-
+from . import TranslatorEngines
 from .TranslatorLanguagesDb import TranslatorLanguagesDb
-from . import TranslatorEngines
-
-from eric7.EricGui import EricPixmapCache
+from .Ui_TranslatorWidget import Ui_TranslatorWidget


 class TranslatorWidget(QWidget, Ui_TranslatorWidget):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 Module implementing the Git configuration page.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog
@@ -17,6 +17,7 @@
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
 from .Ui_GitPage import Ui_GitPage
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitAddRemoteDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data of a remote repository.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitAddRemoteDialog import Ui_GitAddRemoteDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitArchiveDataDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog

 from .Ui_GitArchiveDataDialog import Ui_GitArchiveDataDialog

-from eric7.EricGui import EricPixmapCache
-from eric7 import Utilities
-

 class GitArchiveDataDialog(QDialog, Ui_GitArchiveDataDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBisectLogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,24 +9,23 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt6.QtCore import QPoint, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
+    QLineEdit,
     QTreeWidgetItem,
-    QApplication,
-    QLineEdit,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.Globals import strToQByteArray

 from .Ui_GitBisectLogBrowserDialog import Ui_GitBisectLogBrowserDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitBisectLogBrowserDialog(QWidget, Ui_GitBisectLogBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitBlameDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os
 import re

-from PyQt6.QtCore import pyqtSlot, QProcess, QTimer, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
     QDialog,
     QDialogButtonBox,
@@ -19,13 +19,12 @@
     QTreeWidgetItem,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_GitBlameDialog import Ui_GitBlameDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitBlameDialog(QDialog, Ui_GitBlameDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitChangeRemoteUrlDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to change the URL of a remote git repository.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_GitChangeRemoteUrlDialog import Ui_GitChangeRemoteUrlDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommandDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_GitCommandDialog import Ui_GitCommandDialog
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_GitCommandDialog import Ui_GitCommandDialog


 class GitCommandDialog(QDialog, Ui_GitCommandDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCommitDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitCopyDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,13 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from eric7.EricWidgets.EricCompleters import EricFileCompleter, EricDirCompleter
+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog
+from eric7.EricWidgets.EricCompleters import EricDirCompleter, EricFileCompleter

 from .Ui_GitCopyDialog import Ui_GitCopyDialog

-from eric7 import Utilities
-from eric7.EricGui import EricPixmapCache
-

 class GitCopyDialog(QDialog, Ui_GitCopyDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDescribeDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,21 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
     QDialog,
     QDialogButtonBox,
     QHeaderView,
+    QLineEdit,
     QTreeWidgetItem,
-    QLineEdit,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_GitDescribeDialog import Ui_GitDescribeDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitDescribeDialog(QDialog, Ui_GitDescribeDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,21 @@
 import os

 from PyQt6.QtCore import (
+    QCoreApplication,
     QProcess,
+    QProcessEnvironment,
+    Qt,
     QTimer,
     pyqtSlot,
-    Qt,
-    QCoreApplication,
-    QProcessEnvironment,
 )
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_GitDialog import Ui_GitDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitDialog(QDialog, Ui_GitDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,20 +11,18 @@
 import contextlib
 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricTextEditSearchWidget import EricTextEditSearchWidget

-from .Ui_GitDiffDialog import Ui_GitDiffDialog
-
+from .GitDiffGenerator import GitDiffGenerator
 from .GitDiffHighlighter import GitDiffHighlighter
-from .GitDiffGenerator import GitDiffGenerator
-
-from eric7 import Preferences
+from .Ui_GitDiffDialog import Ui_GitDiffDialog


 class GitDiffDialog(QWidget, Ui_GitDiffDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,10 @@

 import os

-from PyQt6.QtCore import pyqtSignal, QProcess, QTimer, QObject
-
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from PyQt6.QtCore import QObject, QProcess, QTimer, pyqtSignal

 from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess


 class GitDiffGenerator(QObject):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffParser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffParser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a class to store and parse diff output.
 """

+import os
 import re
-import os


 class GitDiffParser:
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitLogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,38 +7,35 @@
 Module implementing a dialog to browse the log history.
 """

+import collections
+import contextlib
 import os
-import collections
-import re
-import contextlib
 import pathlib
+import re

-from PyQt6.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QSize, QPoint
-from PyQt6.QtGui import QColor, QPixmap, QPainter, QPen, QIcon, QTextCursor, QPalette
+from PyQt6.QtCore import QDate, QPoint, QProcess, QSize, Qt, QTimer, pyqtSlot
+from PyQt6.QtGui import QColor, QIcon, QPainter, QPalette, QPen, QPixmap, QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
-    QTreeWidgetItem,
-    QApplication,
+    QInputDialog,
     QLineEdit,
     QMenu,
-    QInputDialog,
+    QTreeWidgetItem,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
-
 from eric7.Globals import strToQByteArray

-from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog
-
+from .GitDiffGenerator import GitDiffGenerator
 from .GitDiffHighlighter import GitDiffHighlighter
-from .GitDiffGenerator import GitDiffGenerator
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
+from .Ui_GitLogBrowserDialog import Ui_GitLogBrowserDialog

 COLORNAMES = [
     "red",
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitNewProjectOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,17 +8,16 @@
 repository.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from eric7.EricWidgets.EricCompleters import EricDirCompleter
-from eric7.EricWidgets import EricFileDialog
-
-from .Ui_GitNewProjectOptionsDialog import Ui_GitNewProjectOptionsDialog
-from .Config import ConfigGitSchemes
-
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog
+from eric7.EricWidgets.EricCompleters import EricDirCompleter
+
+from .Config import ConfigGitSchemes
+from .Ui_GitNewProjectOptionsDialog import Ui_GitNewProjectOptionsDialog


 class GitNewProjectOptionsDialog(QDialog, Ui_GitNewProjectOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchFilesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog

 from .Ui_GitPatchFilesDialog import Ui_GitPatchFilesDialog

-from eric7.EricGui import EricPixmapCache
-from eric7 import Utilities
-

 class GitPatchFilesDialog(QDialog, Ui_GitPatchFilesDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,14 @@

 import os

-from PyQt6.QtCore import Qt, QProcess
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import QProcess, Qt
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_GitPatchStatisticsDialog import Ui_GitPatchStatisticsDialog

-from eric7 import Preferences
-

 class GitPatchStatisticsDialog(QDialog, Ui_GitPatchStatisticsDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitPushDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter data for a Push operation.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QComboBox
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QComboBox, QDialog, QTreeWidgetItem

 from .Ui_GitPushDialog import Ui_GitPushDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitReflogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,24 +9,23 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QPoint
+from PyQt6.QtCore import QPoint, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
+    QLineEdit,
     QTreeWidgetItem,
-    QApplication,
-    QLineEdit,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.Globals import strToQByteArray

 from .Ui_GitReflogBrowserDialog import Ui_GitReflogBrowserDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitReflogBrowserDialog(QWidget, Ui_GitReflogBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteCredentialsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data of a remote repository.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog

 from .Ui_GitRemoteCredentialsDialog import Ui_GitRemoteCredentialsDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitRemoteRepositoriesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,21 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QDialogButtonBox,
     QHeaderView,
+    QLineEdit,
     QTreeWidgetItem,
-    QDialogButtonBox,
-    QLineEdit,
+    QWidget,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_GitRemoteRepositoriesDialog import Ui_GitRemoteRepositoriesDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitRemoteRepositoriesDialog(QWidget, Ui_GitRemoteRepositoriesDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStashBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,26 +9,25 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt6.QtCore import QPoint, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QAbstractButton,
+    QApplication,
     QDialogButtonBox,
+    QHeaderView,
+    QLineEdit,
+    QMenu,
     QTreeWidgetItem,
-    QAbstractButton,
-    QMenu,
-    QHeaderView,
-    QApplication,
-    QLineEdit,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.Globals import strToQByteArray

 from .Ui_GitStashBrowserDialog import Ui_GitStashBrowserDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitStashBrowserDialog(QWidget, Ui_GitStashBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,35 +8,32 @@
 process.
 """

+import contextlib
 import os
 import tempfile
-import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer, QSize
+from PyQt6.QtCore import QProcess, QSize, Qt, QTimer, pyqtSlot
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
     QDialogButtonBox,
-    QMenu,
     QHeaderView,
-    QTreeWidgetItem,
+    QInputDialog,
     QLineEdit,
-    QInputDialog,
+    QMenu,
+    QTreeWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
-from eric7.Globals import strToQByteArray
-
-from .Ui_GitStatusDialog import Ui_GitStatusDialog
-
-from .GitDiffHighlighter import GitDiffHighlighter
-from .GitDiffGenerator import GitDiffGenerator
-from .GitDiffParser import GitDiffParser
-
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import strToQByteArray
+
+from .GitDiffGenerator import GitDiffGenerator
+from .GitDiffHighlighter import GitDiffHighlighter
+from .GitDiffParser import GitDiffParser
+from .Ui_GitStatusDialog import Ui_GitStatusDialog


 class GitStatusDialog(QWidget, Ui_GitStatusDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitStatusMonitorThread.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,9 @@

 from PyQt6.QtCore import QProcess

+from eric7 import Preferences
 from eric7.VCS.StatusMonitorThread import VcsStatusMonitorThread

-from eric7 import Preferences
-

 class GitStatusMonitorThread(VcsStatusMonitorThread):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmoduleAddDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,16 @@
 Module implementing a dialog to enter the data to add a submodule.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from eric7.EricWidgets.EricCompleters import EricDirCompleter
-from eric7.EricWidgets import EricFileDialog
-
-from .Ui_GitSubmoduleAddDialog import Ui_GitSubmoduleAddDialog
-from .Config import ConfigGitSchemes
-
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog
+from eric7.EricWidgets.EricCompleters import EricDirCompleter
+
+from .Config import ConfigGitSchemes
+from .Ui_GitSubmoduleAddDialog import Ui_GitSubmoduleAddDialog


 class GitSubmoduleAddDialog(QDialog, Ui_GitSubmoduleAddDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

 from .Ui_GitSubmodulesListDialog import Ui_GitSubmodulesListDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitSubmodulesStatusDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,18 +10,18 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtCore import QProcess, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractButton,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
-    QHeaderView,
-    QAbstractButton,
 )

-from .Ui_GitSubmodulesStatusDialog import Ui_GitSubmodulesStatusDialog
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_GitSubmodulesStatusDialog import Ui_GitSubmodulesStatusDialog


 class GitSubmodulesStatusDialog(QDialog, Ui_GitSubmodulesStatusDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/GitTagBranchListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,21 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QProcess, Qt, QTimer, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
     QDialog,
     QDialogButtonBox,
     QHeaderView,
+    QLineEdit,
     QTreeWidgetItem,
-    QLineEdit,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_GitTagBranchListDialog import Ui_GitTagBranchListDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class GitTagBranchListDialog(QDialog, Ui_GitTagBranchListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,12 @@

 import os

-from PyQt6.QtWidgets import QMenu, QDialog
+from PyQt6.QtWidgets import QDialog, QMenu

 from eric7.EricGui import EricPixmapCache
-
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-
 from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,18 +10,15 @@
 import os
 import pathlib

-from PyQt6.QtWidgets import QMenu, QInputDialog, QToolBar
+from PyQt6.QtWidgets import QInputDialog, QMenu, QToolBar

+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7.UI import Config
 from eric7.VCS.ProjectHelper import VcsProjectHelper

-from eric7.EricGui.EricAction import EricAction
-
-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-

 class GitProjectHelper(VcsProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsGit/git.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,27 +7,24 @@
 Module implementing the version control systems interface to Git.
 """

+import contextlib
 import os
-import shutil
+import pathlib
 import re
-import contextlib
-import pathlib
+import shutil

 from PyQt6.QtCore import QProcess, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit

+from eric7 import Globals, Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
 from eric7.QScintilla.MiniEditor import MiniEditor
-
+from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
 from eric7.VCS.VersionControl import VersionControl
-from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog

 from .GitDialog import GitDialog

-from eric7 import Globals, Preferences, Utilities
-

 class Git(VersionControl):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class CloseheadProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Closehead(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,17 +11,16 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Globals
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
-from .Ui_MercurialPage import Ui_MercurialPage
-from .. import HgUtilities
+from eric7.Utilities import supportedCodecs

-from eric7 import Globals
-from eric7.Utilities import supportedCodecs
+from .. import HgUtilities
+from .Ui_MercurialPage import Ui_MercurialPage


 class MercurialPage(ConfigurationPageBase, Ui_MercurialPage):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import re

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem

 from .Ui_HgGpgSignaturesDialog import Ui_HgGpgSignaturesDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class GpgProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog
 from ..HgRevisionSelectionDialog import HgRevisionSelectionDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,11 +12,10 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

-from eric7 import Utilities
-
 from .Ui_HgAddSubrepositoryDialog import Ui_HgAddSubrepositoryDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import re

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem

 from eric7 import Preferences
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,12 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_HgArchiveDialog import Ui_HgArchiveDialog

-from eric7 import Utilities
-

 class HgArchiveDialog(QDialog, Ui_HgArchiveDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a backout operation.
 """

-from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtCore import QDateTime, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksInOutDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show a list of incoming or outgoing bookmarks.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem

 from .Ui_HgBookmarksInOutDialog import Ui_HgBookmarksInOutDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgBookmarksListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,24 +7,23 @@
 Module implementing a dialog to show a list of bookmarks.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
+from PyQt6.QtCore import QCoreApplication, QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QDialog,
     QDialogButtonBox,
     QHeaderView,
-    QTreeWidgetItem,
+    QInputDialog,
     QLineEdit,
     QMenu,
-    QInputDialog,
+    QTreeWidgetItem,
 )

+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

 from .Ui_HgBookmarksListDialog import Ui_HgBookmarksListDialog

-from eric7.EricGui import EricPixmapCache
-

 class HgBookmarksListDialog(QDialog, Ui_HgBookmarksListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing an interface to the Mercurial command server.
 """

+import io
 import struct
-import io

-from PyQt6.QtCore import QProcess, QObject, QByteArray, QCoreApplication, QThread
+from PyQt6.QtCore import QByteArray, QCoreApplication, QObject, QProcess, QThread
 from PyQt6.QtWidgets import QDialog

-from .HgUtilities import prepareProcess, getHgExecutable
+from .HgUtilities import getHgExecutable, prepareProcess


 class HgClient(QObject):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgClientPromptDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a prompt dialog for the Mercurial command server.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommandDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_HgCommandDialog import Ui_HgCommandDialog
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_HgCommandDialog import Ui_HgCommandDialog


 class HgCommandDialog(QDialog, Ui_HgCommandDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QDateTime
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import QDateTime, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,22 +8,21 @@
 conflicts.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QAbstractButton,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
     QTreeWidgetItem,
-    QApplication,
     QWidget,
 )

 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Utilities import MimeTypes

 from .Ui_HgConflictsListDialog import Ui_HgConflictsListDialog

-from eric7.Utilities import MimeTypes
-

 class HgConflictsListDialog(QWidget, Ui_HgConflictsListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog starting a process and showing its output.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_HgDialog import Ui_HgDialog
+from eric7 import Preferences, Utilities

-from eric7 import Preferences, Utilities
+from .Ui_HgDialog import Ui_HgDialog


 class HgDialog(QDialog, Ui_HgDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,17 @@

 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from .Ui_HgDiffDialog import Ui_HgDiffDialog
+from .HgDiffGenerator import HgDiffGenerator
 from .HgDiffHighlighter import HgDiffHighlighter
-from .HgDiffGenerator import HgDiffGenerator
-
-from eric7 import Preferences
+from .Ui_HgDiffDialog import Ui_HgDiffDialog


 class HgDiffDialog(QWidget, Ui_HgDiffDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgDiffGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import QObject, pyqtSignal

 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QDir
+from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgGraftDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the data for a graft session.
 """

-from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtCore import QDateTime, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_HgGraftDialog import Ui_HgGraftDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter data for the Mercurial import command.
 """

-from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtCore import QDateTime, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,45 +7,43 @@
 Module implementing a dialog to browse the log history.
 """

-import os
-import re
 import collections
 import contextlib
+import os
 import pathlib
+import re

-from PyQt6.QtCore import pyqtSlot, Qt, QDate, QSize, QPoint
+from PyQt6.QtCore import QDate, QPoint, QSize, Qt, pyqtSlot
 from PyQt6.QtGui import (
+    QBrush,
     QColor,
+    QIcon,
+    QPainter,
+    QPalette,
+    QPen,
     QPixmap,
-    QPainter,
-    QPen,
-    QBrush,
-    QIcon,
     QTextCursor,
-    QPalette,
 )
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialogButtonBox,
     QHeaderView,
-    QTreeWidgetItem,
-    QApplication,
+    QInputDialog,
     QLineEdit,
     QMenu,
-    QInputDialog,
+    QTreeWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp

+from .HgDiffGenerator import HgDiffGenerator
 from .HgDiffHighlighter import HgDiffHighlighter
-from .HgDiffGenerator import HgDiffGenerator
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
+from .Ui_HgLogBrowserDialog import Ui_HgLogBrowserDialog

 COLORNAMES = [
     "blue",
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,16 +8,15 @@
 repository.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QComboBox
-
-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-
-from .Ui_HgNewProjectOptionsDialog import Ui_HgNewProjectOptionsDialog
-from .Config import ConfigHgSchemes
+from PyQt6.QtCore import QUrl, pyqtSlot
+from PyQt6.QtWidgets import QComboBox, QDialog, QDialogButtonBox

 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+
+from .Config import ConfigHgSchemes
+from .Ui_HgNewProjectOptionsDialog import Ui_HgNewProjectOptionsDialog


 class HgNewProjectOptionsDialog(QDialog, Ui_HgNewProjectOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,14 +8,13 @@
 of a repository configuration file (hgrc).
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QLineEdit

-from .Ui_HgRepoConfigDataDialog import Ui_HgRepoConfigDataDialog
-
 from eric7.EricGui import EricPixmapCache

 from .LargefilesExtension import getDefaults as getLargefilesDefaults
+from .Ui_HgRepoConfigDataDialog import Ui_HgRepoConfigDataDialog


 class HgRepoConfigDataDialog(QDialog, Ui_HgRepoConfigDataDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,17 +9,16 @@

 import os

-from PyQt6.QtCore import QProcess, Qt, QSize
-from PyQt6.QtGui import QAction, QTextCursor, QBrush
-from PyQt6.QtWidgets import QToolBar, QPlainTextEdit, QSpinBox, QComboBox
+from PyQt6.QtCore import QProcess, QSize, Qt
+from PyQt6.QtGui import QAction, QBrush, QTextCursor
+from PyQt6.QtWidgets import QComboBox, QPlainTextEdit, QSpinBox, QToolBar

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-
 from .HgUtilities import getHgExecutable
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,26 +10,24 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QSize
+from PyQt6.QtCore import QSize, Qt, pyqtSlot
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
     QDialogButtonBox,
+    QHeaderView,
     QMenu,
-    QHeaderView,
     QTreeWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
-from .Ui_HgStatusDialog import Ui_HgStatusDialog
-
-from .HgDiffHighlighter import HgDiffHighlighter
-from .HgDiffGenerator import HgDiffGenerator
-
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+
+from .HgDiffGenerator import HgDiffGenerator
+from .HgDiffHighlighter import HgDiffHighlighter
+from .Ui_HgStatusDialog import Ui_HgStatusDialog


 class HgStatusDialog(QWidget, Ui_HgStatusDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,23 +7,22 @@
 Module implementing a dialog to show a list of tags or branches.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QPoint
+from PyQt6.QtCore import QCoreApplication, QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractItemView,
     QDialog,
     QDialogButtonBox,
     QHeaderView,
+    QMenu,
     QTreeWidgetItem,
-    QMenu,
-    QAbstractItemView,
 )

+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

 from .Ui_HgTagBranchListDialog import Ui_HgTagBranchListDialog

-from eric7.EricGui import EricPixmapCache
-

 class HgTagBranchListDialog(QDialog, Ui_HgTagBranchListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgTagDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_HgTagDialog import Ui_HgTagDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_HgTagDialog import Ui_HgTagDialog


 class HgTagDialog(QDialog, Ui_HgTagDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,24 @@
 Module implementing a dialog to enter some user data.
 """

+import contextlib
 import os
+
 from configparser import ConfigParser
-import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets import EricMessageBox

-from eric7 import Globals
-
-from .HgUtilities import getConfigPath
 from .HgUserConfigHostFingerprintDialog import HgUserConfigHostFingerprintDialog
 from .HgUserConfigHostMinimumProtocolDialog import HgUserConfigHostMinimumProtocolDialog
-
+from .HgUtilities import getConfigPath
 from .Ui_HgUserConfigDialog import Ui_HgUserConfigDialog

-from eric7.EricGui import EricPixmapCache
-

 class HgUserConfigDialog(QDialog, Ui_HgUserConfigDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os
 import re

-from PyQt6.QtCore import QProcess, QProcessEnvironment, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QProcess, QProcessEnvironment

 from eric7 import Utilities
 from eric7.Globals import isWindowsPlatform
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditCommitEditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,13 @@
 Module implementing a dialog to edit the commit message of a revision.
 """

-from PyQt6.QtCore import pyqtSlot, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
-
 from eric7.UI_HgHisteditCommitEditor import Ui_HgHisteditCommitEditor

-from eric7 import Preferences
-

 class HgHisteditCommitEditor(QDialog, Ui_HgHisteditCommitEditor):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditConfigDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup
+from PyQt6.QtWidgets import QButtonGroup, QDialog, QDialogButtonBox

 from .Ui_HgHisteditConfigDialog import Ui_HgHisteditConfigDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 of two possible dialogs will be shown.
 """

+import os
 import sys
-import os

 sys.path.insert(1, os.path.join(os.path.dirname(__file__), "..", "..", "..", ".."))
 # four times up is the eric7 package directory
@@ -36,7 +36,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,12 @@
 Module implementing a dialog to edit the history modification plan.
 """

-from PyQt6.QtCore import pyqtSlot, QCoreApplication
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QComboBox
-
-from eric7.EricWidgets import EricMessageBox
-
-from eric7.UI_HgHisteditPlanEditor import Ui_HgHisteditPlanEditor
+from PyQt6.QtCore import QCoreApplication, pyqtSlot
+from PyQt6.QtWidgets import QComboBox, QDialog, QTreeWidgetItem

 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.UI_HgHisteditPlanEditor import Ui_HgHisteditPlanEditor


 class HgHisteditPlanActionComboBox(QComboBox):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class HisteditProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,10 @@

 from PyQt6.QtWidgets import QDialog

-from ..HgExtension import HgExtension
+from eric7 import Globals
+
 from ..HgDialog import HgDialog
-
-from eric7 import Globals
+from ..HgExtension import HgExtension


 class Histedit(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from . import getDefaults
 from .Ui_LfConvertDataDialog import Ui_LfConvertDataDialog

-from . import getDefaults
-
-from eric7 import Utilities
-

 class LfConvertDataDialog(QDialog, Ui_LfConvertDataDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QMenu

-from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from ..HgExtensionProjectBrowserHelper import HgExtensionProjectBrowserHelper


 class LargefilesProjectBrowserHelper(HgExtensionProjectBrowserHelper):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class LargefilesProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,12 @@
 from PyQt6.QtCore import QTimer
 from PyQt6.QtWidgets import QDialog

+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

-from ..HgExtension import HgExtension
+from ..HgClient import HgClient
 from ..HgDialog import HgDialog
-from ..HgClient import HgClient
+from ..HgExtension import HgExtension


 class Largefiles(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,12 @@

 import os

-from PyQt6.QtWidgets import QMenu, QDialog
+from PyQt6.QtWidgets import QDialog, QMenu

 from eric7.EricGui import EricPixmapCache
-
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-
 from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper


@@ -57,10 +54,10 @@
         )

         # instantiate the extensions
-        from .ShelveExtension.ProjectBrowserHelper import ShelveProjectBrowserHelper
         from .LargefilesExtension.ProjectBrowserHelper import (
             LargefilesProjectBrowserHelper,
         )
+        from .ShelveExtension.ProjectBrowserHelper import ShelveProjectBrowserHelper

         self.__extensions = {
             "shelve": ShelveProjectBrowserHelper(
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,17 +11,14 @@

 from PyQt6.QtWidgets import QMenu, QToolBar

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7.UI import Config
 from eric7.VCS.ProjectHelper import VcsProjectHelper

-from eric7.EricGui.EricAction import EricAction
-
-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-from eric7 import Preferences
-

 class HgProjectHelper(VcsProjectHelper):
     """
@@ -40,15 +37,15 @@
         VcsProjectHelper.__init__(self, vcsObject, projectObject, parent, name)

         # instantiate the extensions
-        from .QueuesExtension.ProjectHelper import QueuesProjectHelper
+        from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper
+        from .GpgExtension.ProjectHelper import GpgProjectHelper
+        from .HisteditExtension.ProjectHelper import HisteditProjectHelper
+        from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper
         from .PurgeExtension.ProjectHelper import PurgeProjectHelper
-        from .GpgExtension.ProjectHelper import GpgProjectHelper
+        from .QueuesExtension.ProjectHelper import QueuesProjectHelper
         from .RebaseExtension.ProjectHelper import RebaseProjectHelper
         from .ShelveExtension.ProjectHelper import ShelveProjectHelper
-        from .LargefilesExtension.ProjectHelper import LargefilesProjectHelper
         from .StripExtension.ProjectHelper import StripProjectHelper
-        from .HisteditExtension.ProjectHelper import HisteditProjectHelper
-        from .CloseheadExtension.ProjectHelper import CloseheadProjectHelper

         self.__extensions = {
             "mq": QueuesProjectHelper(),
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class PurgeProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Purge(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a dialog to define guards for patches.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox, QListWidgetItem

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_HgQueuesDefineGuardsDialog import Ui_HgQueuesDefineGuardsDialog

-from eric7.EricGui import EricPixmapCache
-

 class HgQueuesDefineGuardsDialog(QDialog, Ui_HgQueuesDefineGuardsDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesFoldDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a dialog to enter data to fold patches.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_HgQueuesFoldDialog import Ui_HgQueuesFoldDialog

-from eric7.EricGui import EricPixmapCache
-

 class HgQueuesFoldDialog(QDialog, Ui_HgQueuesFoldDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesGuardsSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,10 +8,10 @@
 """

 from PyQt6.QtWidgets import (
+    QAbstractItemView,
     QDialog,
     QDialogButtonBox,
     QListWidgetItem,
-    QAbstractItemView,
 )

 from .Ui_HgQueuesGuardsSelectionDialog import Ui_HgQueuesGuardsSelectionDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to show the commit message of the current patch.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_HgQueuesHeaderDialog import Ui_HgQueuesHeaderDialog
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_HgQueuesHeaderDialog import Ui_HgQueuesHeaderDialog


 class HgQueuesHeaderDialog(QDialog, Ui_HgQueuesHeaderDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to show all guards for all patches.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

-from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_HgQueuesListAllGuardsDialog import Ui_HgQueuesListAllGuardsDialog


 class HgQueuesListAllGuardsDialog(QDialog, Ui_HgQueuesListAllGuardsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show a list of applied and unapplied patches.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem

 from .Ui_HgQueuesListDialog import Ui_HgQueuesListDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to show the guards of a selected patch.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QListWidgetItem

-from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_HgQueuesListGuardsDialog import Ui_HgQueuesListGuardsDialog


 class HgQueuesListGuardsDialog(QDialog, Ui_HgQueuesListGuardsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesNewPatchDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to get the data for a new patch.
 """

-from PyQt6.QtCore import pyqtSlot, QDateTime
+from PyQt6.QtCore import QDateTime, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing a dialog used by the queue management functions.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
+    QAbstractButton,
+    QAbstractItemView,
     QDialog,
     QDialogButtonBox,
-    QAbstractItemView,
     QListWidgetItem,
-    QAbstractButton,
 )

 from .Ui_HgQueuesQueueManagementDialog import Ui_HgQueuesQueueManagementDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,7 +13,6 @@
 from eric7.EricWidgets import EricMessageBox

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper
-
 from .queues import Queues
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing the queues extension interface.
 """

-from PyQt6.QtWidgets import QDialog, QApplication, QInputDialog
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog

 from eric7.EricWidgets import EricMessageBox

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Queues(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup
+from PyQt6.QtWidgets import QButtonGroup, QDialog, QDialogButtonBox

 from .Ui_HgRebaseDialog import Ui_HgRebaseDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class RebaseProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Rebase(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,15 @@
 Module implementing Mercurial shelve browser dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QAbstractButton,
+    QApplication,
     QDialogButtonBox,
+    QHeaderView,
+    QMenu,
     QTreeWidgetItem,
-    QAbstractButton,
-    QMenu,
-    QHeaderView,
-    QApplication,
+    QWidget,
 )

 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@

 from eric7.EricWidgets import EricMessageBox

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Shelve(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox

 from ..HgExtensionProjectHelper import HgExtensionProjectHelper

-from eric7.EricGui import EricPixmapCache
-

 class StripProjectHelper(HgExtensionProjectHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from ..HgDialog import HgDialog
 from ..HgExtension import HgExtension
-from ..HgDialog import HgDialog


 class Strip(HgExtension):
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,23 @@
 Module implementing the version control systems interface to Mercurial.
 """

+import contextlib
 import os
+import pathlib
 import shutil
-import contextlib
-import pathlib
-
-from PyQt6.QtCore import pyqtSignal, QFileSystemWatcher, QCoreApplication
+
+from PyQt6.QtCore import QCoreApplication, QFileSystemWatcher, pyqtSignal
 from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from eric7.QScintilla.MiniEditor import MiniEditor
-
-from eric7.VCS.VersionControl import VersionControl
-from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
-
-from .HgDialog import HgDialog
-from .HgClient import HgClient
-
 from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.QScintilla.MiniEditor import MiniEditor
+from eric7.VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog
+from eric7.VCS.VersionControl import VersionControl
+
+from .HgClient import HgClient
+from .HgDialog import HgDialog


 class Hg(VersionControl):
@@ -138,15 +135,15 @@
         self.__defaultPushConfigured = False

         # instantiate the extensions
-        from .QueuesExtension.queues import Queues
+        from .CloseheadExtension.closehead import Closehead
+        from .GpgExtension.gpg import Gpg
+        from .HisteditExtension.histedit import Histedit
+        from .LargefilesExtension.largefiles import Largefiles
         from .PurgeExtension.purge import Purge
-        from .GpgExtension.gpg import Gpg
+        from .QueuesExtension.queues import Queues
         from .RebaseExtension.rebase import Rebase
         from .ShelveExtension.shelve import Shelve
-        from .LargefilesExtension.largefiles import Largefiles
         from .StripExtension.strip import Strip
-        from .HisteditExtension.histedit import Histedit
-        from .CloseheadExtension.closehead import Closehead

         self.__extensions = {
             "mq": Queues(self),
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ConfigurationPage/SubversionPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,6 +12,7 @@
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
 from .Ui_SubversionPage import Ui_SubversionPage
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,14 +13,11 @@

 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
 from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper

-from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-
-from eric7.EricGui import EricPixmapCache
-

 class SvnProjectBrowserHelper(VcsProjectBrowserHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,11 @@

 from PyQt6.QtWidgets import QToolBar

-from eric7.VCS.ProjectHelper import VcsProjectHelper
-
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config
+from eric7.VCS.ProjectHelper import VcsProjectHelper


 class PySvnProjectHelper(VcsProjectHelper):
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnBlameDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,15 +12,14 @@
 import pysvn

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QHeaderView, QDialog, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem

+from eric7 import Preferences
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker

 from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog

-from eric7 import Preferences
-

 class SvnBlameDialog(QDialog, SvnDialogMixin, Ui_SvnBlameDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnChangeListsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,15 +11,13 @@

 import pysvn

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker

 from .SvnDialogMixin import SvnDialogMixin
-
 from .Ui_SvnChangeListsDialog import Ui_SvnChangeListsDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_SvnCommandDialog import Ui_SvnCommandDialog

-from eric7 import Utilities
-

 class SvnCommandDialog(QDialog, Ui_SvnCommandDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 import pysvn

-from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnConst.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing some constants for the pysvn package.
 """

-from PyQt6.QtCore import QT_TRANSLATE_NOOP
+import pysvn

-import pysvn
+from PyQt6.QtCore import QT_TRANSLATE_NOOP

 svnNotifyActionMap = {
     pysvn.wc_notify_action.add: QT_TRANSLATE_NOOP("Subversion", "Add"),
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,15 +10,14 @@
 import pysvn

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QDialog, QApplication, QDialogButtonBox
+from PyQt6.QtWidgets import QApplication, QDialog, QDialogButtonBox
+
+from eric7 import Preferences

 from .SvnConst import svnNotifyActionMap
-
 from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnDialog import Ui_SvnDialog

-from eric7 import Preferences
-

 class SvnDialog(QDialog, SvnDialogMixin, Ui_SvnDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,19 +15,17 @@

 from PyQt6.QtCore import QDateTime, Qt, pyqtSlot
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

+from eric7 import Preferences, Utilities
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker

 from .SvnDialogMixin import SvnDialogMixin
+from .SvnDiffHighlighter import SvnDiffHighlighter
 from .Ui_SvnDiffDialog import Ui_SvnDiffDialog
-from .SvnDiffHighlighter import SvnDiffHighlighter
-
-from eric7 import Preferences, Utilities


 class SvnDiffDialog(QWidget, SvnDialogMixin, Ui_SvnDiffDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,13 +13,13 @@
 import pysvn

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QDialog, QApplication
+from PyQt6.QtWidgets import QApplication, QDialog

 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
+from eric7.VCS.Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog

+from .SvnDialogMixin import SvnDialogMixin
 from .SvnUtilities import formatTime
-from .SvnDialogMixin import SvnDialogMixin
-from eric7.VCS.Ui_RepositoryInfoDialog import Ui_VcsRepositoryInfoDialog


 class SvnInfoDialog(QDialog, SvnDialogMixin, Ui_VcsRepositoryInfoDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,32 +7,29 @@
 Module implementing a dialog to browse the log history.
 """

+import os
 import re
-import os

 import pysvn

-from PyQt6.QtCore import Qt, QDate, pyqtSlot, QPoint
+from PyQt6.QtCore import QDate, QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QHeaderView,
-    QWidget,
     QApplication,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets import EricMessageBox
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
+from eric7.EricWidgets import EricMessageBox

-from .SvnUtilities import formatTime, dateFromTime_t
 from .SvnDialogMixin import SvnDialogMixin
-
+from .SvnUtilities import dateFromTime_t, formatTime
 from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog

-from eric7.EricGui import EricPixmapCache
-

 class SvnLogBrowserDialog(QWidget, SvnDialogMixin, Ui_SvnLogBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@
 from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from .Config import ConfigSvnProtocols
 from .Ui_SvnNewProjectOptionsDialog import Ui_SvnNewProjectOptionsDialog
-from .Config import ConfigSvnProtocols
-
-from eric7 import Preferences, Utilities


 class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@
 from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from .Config import ConfigSvnProtocols
 from .Ui_SvnOptionsDialog import Ui_SvnOptionsDialog
-from .Config import ConfigSvnProtocols
-
-from eric7 import Utilities


 class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnPropListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,13 @@

 import pysvn

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QHeaderView,
     QApplication,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
+    QWidget,
 )

 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnRepoBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,25 +11,22 @@

 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QHeaderView,
+    QApplication,
     QDialog,
-    QApplication,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
 )

+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
-
+from .SvnDialogMixin import SvnDialogMixin
 from .SvnUtilities import formatTime
-from .SvnDialogMixin import SvnDialogMixin
-
 from .Ui_SvnRepoBrowserDialog import Ui_SvnRepoBrowserDialog

-from eric7.EricGui import EricPixmapCache
-

 class SvnRepoBrowserDialog(QDialog, SvnDialogMixin, Ui_SvnRepoBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,27 +14,24 @@

 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
+    QDialogButtonBox,
     QHeaderView,
-    QApplication,
     QMenu,
-    QDialogButtonBox,
     QTreeWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences, Utilities
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp

 from .SvnConst import svnStatusMap
 from .SvnDialogMixin import SvnDialogMixin
-
 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog

-from eric7 import Preferences, Utilities
-

 class SvnStatusDialog(QWidget, SvnDialogMixin, Ui_SvnStatusDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnStatusMonitorThread.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,9 @@

 import pysvn

+from eric7 import Preferences
 from eric7.VCS.StatusMonitorThread import VcsStatusMonitorThread

-from eric7 import Preferences
-

 class SvnStatusMonitorThread(VcsStatusMonitorThread):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnTagBranchListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,27 @@
 Module implementing a dialog to show a list of tags or branches.
 """

+import os
 import re
-import os

 import pysvn

 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import (
-    QHeaderView,
-    QLineEdit,
+    QApplication,
     QDialog,
+    QDialogButtonBox,
+    QHeaderView,
     QInputDialog,
-    QApplication,
-    QDialogButtonBox,
+    QLineEdit,
     QTreeWidgetItem,
 )

+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets import EricMessageBox

-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
-
+from .SvnDialogMixin import SvnDialogMixin
 from .SvnUtilities import formatTime
-
-from .SvnDialogMixin import SvnDialogMixin
 from .Ui_SvnTagBranchListDialog import Ui_SvnTagBranchListDialog
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUrlSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,17 @@

 import re

+import pysvn
+
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets.EricApplication import ericApp
+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
-
-import pysvn
+from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog

-from eric7 import Utilities
-

 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/SvnUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing some common utility functions for the pysvn package.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import QDateTime, Qt
--- a/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsPySvn/subversion.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,27 @@
 Module implementing the version control systems interface to Subversion.
 """

+import contextlib
+import os
 import re
-import os
 import shutil
 import time
+
 from urllib.parse import quote
-import contextlib
-
-from PyQt6.QtCore import pyqtSignal, Qt, QDateTime, QCoreApplication
-from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
-
-from eric7.VCS.VersionControl import VersionControl

 import pysvn

-from .SvnDialog import SvnDialog
-from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig
+from PyQt6.QtCore import QCoreApplication, QDateTime, Qt, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit

 from eric7 import Preferences, Utilities
+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.VCS.VersionControl import VersionControl
+
+from .SvnDialog import SvnDialog
+from .SvnUtilities import amendConfig, createDefaultConfig, getConfigPath


 class Subversion(VersionControl):
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ConfigurationPage/SubversionPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,6 +12,7 @@
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
 from .Ui_SubversionPage import Ui_SubversionPage
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,16 +8,14 @@
 """

 import os
+
 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
-
+from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
 from eric7.VCS.ProjectBrowserHelper import VcsProjectBrowserHelper

-from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
-
-from eric7.EricGui import EricPixmapCache
-

 class SvnProjectBrowserHelper(VcsProjectBrowserHelper):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,11 @@

 from PyQt6.QtWidgets import QToolBar

-from eric7.VCS.ProjectHelper import VcsProjectHelper
-
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config
+from eric7.VCS.ProjectHelper import VcsProjectHelper


 class SvnProjectHelper(VcsProjectHelper):
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,21 @@

 import os

-from PyQt6.QtCore import QTimer, QProcess, Qt, pyqtSlot
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
     QHeaderView,
     QLineEdit,
-    QDialog,
-    QDialogButtonBox,
     QTreeWidgetItem,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_SvnBlameDialog import Ui_SvnBlameDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnBlameDialog(QDialog, Ui_SvnBlameDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnChangeListsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,19 +7,18 @@
 Module implementing a dialog to browse the change lists.
 """

+import os
 import re
-import os

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess, QTimer
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, QLineEdit
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit, QListWidgetItem

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_SvnChangeListsDialog import Ui_SvnChangeListsDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnChangeListsDialog(QDialog, Ui_SvnChangeListsDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommandDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_SvnCommandDialog import Ui_SvnCommandDialog

-from eric7 import Utilities
-

 class SvnCommandDialog(QDialog, Ui_SvnCommandDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to enter the commit message.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot
-from PyQt6.QtWidgets import QWidget, QDialogButtonBox
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialogButtonBox, QWidget

 from eric7.EricWidgets.EricApplication import ericApp
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,16 +9,15 @@

 import os

-from PyQt6.QtCore import QTimer, QProcess, pyqtSlot, Qt, QProcessEnvironment
-from PyQt6.QtWidgets import QLineEdit, QDialog, QDialogButtonBox
+from PyQt6.QtCore import QProcess, QProcessEnvironment, Qt, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QLineEdit

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_SvnDialog import Ui_SvnDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnDialog(QDialog, Ui_SvnDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,19 +11,18 @@
 import os
 import pathlib

-from PyQt6.QtCore import QTimer, QProcess, pyqtSlot, Qt
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QWidget, QLineEdit, QDialogButtonBox
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from .Ui_SvnDiffDialog import Ui_SvnDiffDialog
-from .SvnDiffHighlighter import SvnDiffHighlighter
+from PyQt6.QtWidgets import QDialogButtonBox, QLineEdit, QWidget

 from eric7 import Preferences
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import strToQByteArray

+from .SvnDiffHighlighter import SvnDiffHighlighter
+from .Ui_SvnDiffDialog import Ui_SvnDiffDialog
+

 class SvnDiffDialog(QWidget, Ui_SvnDiffDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,28 +7,27 @@
 Module implementing a dialog to browse the log history.
 """

+import os
 import re
-import os

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QDate, QProcess, QPoint
+from PyQt6.QtCore import QDate, QPoint, QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QApplication,
+    QDialogButtonBox,
     QHeaderView,
     QLineEdit,
+    QTreeWidgetItem,
     QWidget,
-    QApplication,
-    QDialogButtonBox,
-    QTreeWidgetItem,
 )

-from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
-
-from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog
-
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.EricWidgets import EricMessageBox
 from eric7.Globals import strToQByteArray

+from .Ui_SvnLogBrowserDialog import Ui_SvnLogBrowserDialog
+

 class SvnLogBrowserDialog(QWidget, Ui_SvnLogBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@
 from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from .Config import ConfigSvnProtocols
 from .Ui_SvnNewProjectOptionsDialog import Ui_SvnNewProjectOptionsDialog
-from .Config import ConfigSvnProtocols
-
-from eric7 import Preferences, Utilities


 class SvnNewProjectOptionsDialog(QDialog, Ui_SvnNewProjectOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@
 from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from .Config import ConfigSvnProtocols
 from .Ui_SvnOptionsDialog import Ui_SvnOptionsDialog
-from .Config import ConfigSvnProtocols
-
-from eric7 import Utilities


 class SvnOptionsDialog(QDialog, Ui_SvnOptionsDialog):
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,15 +10,14 @@

 import re

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess, QProcessEnvironment
-from PyQt6.QtWidgets import QWidget, QHeaderView, QDialogButtonBox, QTreeWidgetItem
+from PyQt6.QtCore import QProcess, QProcessEnvironment, Qt, QTimer, pyqtSlot
+from PyQt6.QtWidgets import QDialogButtonBox, QHeaderView, QTreeWidgetItem, QWidget

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .Ui_SvnPropListDialog import Ui_SvnPropListDialog

-from eric7 import Preferences
-

 class SvnPropListDialog(QWidget, Ui_SvnPropListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,28 +7,26 @@
 Module implementing the subversion repository browser dialog.
 """

+import os
 import re
-import os

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
     QHeaderView,
     QLineEdit,
-    QDialog,
-    QDialogButtonBox,
     QTreeWidgetItem,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursorProcess
+from eric7.Globals import strToQByteArray

 from .Ui_SvnRepoBrowserDialog import Ui_SvnRepoBrowserDialog

-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnRepoBrowserDialog(QDialog, Ui_SvnRepoBrowserDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,28 +8,27 @@
 process.
 """

+import os
 import re
-import os

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
+    QDialogButtonBox,
     QHeaderView,
     QLineEdit,
-    QApplication,
     QMenu,
-    QDialogButtonBox,
     QTreeWidgetItem,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_SvnStatusDialog import Ui_SvnStatusDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnStatusDialog(QWidget, Ui_SvnStatusDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnStatusMonitorThread.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,9 @@

 from PyQt6.QtCore import QProcess

+from eric7 import Preferences
 from eric7.VCS.StatusMonitorThread import VcsStatusMonitorThread

-from eric7 import Preferences
-

 class SvnStatusMonitorThread(VcsStatusMonitorThread):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,25 @@
 Module implementing a dialog to show a list of tags or branches.
 """

+import os
 import re
-import os

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QProcess
+from PyQt6.QtCore import QProcess, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
     QHeaderView,
+    QInputDialog,
     QLineEdit,
-    QDialog,
-    QInputDialog,
-    QDialogButtonBox,
     QTreeWidgetItem,
 )

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Globals import strToQByteArray

 from .Ui_SvnTagBranchListDialog import Ui_SvnTagBranchListDialog

-from eric7 import Preferences
-from eric7.Globals import strToQByteArray
-

 class SvnTagBranchListDialog(QDialog, Ui_SvnTagBranchListDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUrlSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Utilities
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

 from .Ui_SvnUrlSelectionDialog import Ui_SvnUrlSelectionDialog

-from eric7 import Utilities
-

 class SvnUrlSelectionDialog(QDialog, Ui_SvnUrlSelectionDialog):
     """
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing some common utility functions for the subversion package.
 """

+import contextlib
 import os
-import contextlib

 from eric7 import Utilities
--- a/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsSubversion/subversion.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,20 +10,19 @@
 import os
 import re
 import shutil
+
 from urllib.parse import quote

-from PyQt6.QtCore import pyqtSignal, QProcess, QCoreApplication
-from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication
+from PyQt6.QtCore import QCoreApplication, QProcess, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit

-from eric7.EricWidgets.EricApplication import ericApp
+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.VCS.VersionControl import VersionControl

 from .SvnDialog import SvnDialog
-from .SvnUtilities import getConfigPath, amendConfig, createDefaultConfig
-
-from eric7 import Preferences, Utilities
+from .SvnUtilities import amendConfig, createDefaultConfig, getConfigPath


 class Subversion(VersionControl):
--- a/src/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,26 +9,23 @@

 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QEvent, Qt
+from PyQt6.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
-    QStackedWidget,
-    QSplitter,
+    QApplication,
     QListWidget,
     QListWidgetItem,
+    QMenu,
     QSizePolicy,
-    QMenu,
-    QApplication,
+    QSplitter,
+    QStackedWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.ViewManager.ViewManager import ViewManager
-
 from eric7.QScintilla.Editor import Editor
 from eric7.QScintilla.EditorAssembly import EditorAssembly
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
+from eric7.ViewManager.ViewManager import ViewManager


 class StackedWidget(QStackedWidget):
--- a/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,43 +10,36 @@
 import os

 from PyQt6.QtCore import (
-    pyqtSlot,
+    QByteArray,
+    QEvent,
+    QMimeData,
     QPoint,
-    pyqtSignal,
-    QEvent,
-    QByteArray,
-    QMimeData,
+    QSize,
     Qt,
-    QSize,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QColor, QDrag, QPixmap, QMouseEvent
+from PyQt6.QtGui import QColor, QDrag, QMouseEvent, QPixmap
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QHBoxLayout,
+    QLabel,
+    QMenu,
     QSplitter,
     QTabBar,
-    QApplication,
     QToolButton,
-    QMenu,
-    QLabel,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.ViewManager.ViewManager import ViewManager
-
+from eric7.EricWidgets.EricLed import EricLed
+from eric7.EricWidgets.EricTabWidget import EricTabWidget, EricWheelTabBar
+from eric7.Globals import getConfig, isMacPlatform
 from eric7.QScintilla.Editor import Editor
 from eric7.QScintilla.EditorAssembly import EditorAssembly
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.EricWidgets.EricTabWidget import EricTabWidget, EricWheelTabBar
-from eric7.EricWidgets.EricLed import EricLed
-
-from eric7 import Preferences
-from eric7.Globals import isMacPlatform
-
-from eric7.Globals import getConfig
+from eric7.ViewManager.ViewManager import ViewManager


 class TabBar(EricWheelTabBar):
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopListSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to select multiple entries from a list.
 """

-from PyQt6.QtWidgets import QDialog, QListWidgetItem, QAbstractItemView
+from PyQt6.QtWidgets import QAbstractItemView, QDialog, QListWidgetItem

 from .Ui_DotDesktopListSelectionDialog import Ui_DotDesktopListSelectionDialog
--- a/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,13 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

 from .Ui_DotDesktopWizardDialog import Ui_DotDesktopWizardDialog

-from eric7 import Utilities
-from eric7.EricGui import EricPixmapCache
-

 class DotDesktopWizardDialog(QDialog, Ui_DotDesktopWizardDialog):
     """
--- a/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/EricMessageBoxWizard/EricMessageBoxWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/EricPluginWizard/PluginWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,27 +7,26 @@
 Module implementing the eric plug-in wizard dialog.
 """

-from PyQt6.QtCore import pyqtSlot, QDate
+from PyQt6.QtCore import QDate, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricWidgets.EricApplication import ericApp

-from .Ui_PluginWizardDialog import Ui_PluginWizardDialog
-
 from .Templates import (
-    mainTemplate,
+    apiFilesTemplate,
     configTemplate0,
     configTemplate1,
     configTemplate2,
     configTemplate3,
+    exeDisplayDataInfoTemplate,
+    exeDisplayDataListTemplate,
+    exeDisplayDataTemplate,
+    mainTemplate,
+    moduleSetupTemplate,
     onDemandTemplate,
     previewPixmapTemplate,
-    moduleSetupTemplate,
-    exeDisplayDataTemplate,
-    exeDisplayDataInfoTemplate,
-    exeDisplayDataListTemplate,
-    apiFilesTemplate,
 )
+from .Ui_PluginWizardDialog import Ui_PluginWizardDialog


 class PluginWizardDialog(QDialog, Ui_PluginWizardDialog):
--- a/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/FileDialogWizard/FileDialogWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,10 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QCoreApplication, QUrl
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QFileDialog, QButtonGroup
+from PyQt6.QtCore import QCoreApplication, QUrl, pyqtSlot
+from PyQt6.QtWidgets import QButtonGroup, QDialog, QDialogButtonBox, QFileDialog

-from eric7.EricWidgets.EricCompleters import EricFileCompleter, EricDirCompleter
+from eric7.EricWidgets.EricCompleters import EricDirCompleter, EricFileCompleter

 from .Ui_FileDialogWizardDialog import Ui_FileDialogWizardDialog
--- a/src/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/InputDialogWizard/InputDialogWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,7 @@

 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QDoubleValidator
-from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QInputDialog, QLineEdit

 from .Ui_InputDialogWizardDialog import Ui_InputDialogWizardDialog
--- a/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QMessageBox, QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QMessageBox

 from .Ui_MessageBoxWizardDialog import Ui_MessageBoxWizardDialog
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,17 @@
 from PyQt6.QtCore import QRegularExpression
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import (
-    QSizePolicy,
-    QSpacerItem,
-    QWidget,
+    QComboBox,
+    QDialog,
     QHBoxLayout,
+    QLabel,
     QLineEdit,
     QPushButton,
-    QDialog,
     QScrollArea,
-    QComboBox,
+    QSizePolicy,
+    QSpacerItem,
     QVBoxLayout,
-    QLabel,
+    QWidget,
 )

 from .Ui_PyRegExpWizardCharactersDialog import Ui_PyRegExpWizardCharactersDialog
--- a/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,24 +14,22 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QClipboard, QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialog,
+    QDialogButtonBox,
     QInputDialog,
-    QApplication,
-    QDialogButtonBox,
+    QTableWidgetItem,
     QVBoxLayout,
-    QTableWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow

 from .Ui_PyRegExpWizardDialog import Ui_PyRegExpWizardDialog

-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Preferences, Utilities
-

 class PyRegExpWizardWidget(QWidget, Ui_PyRegExpWizardDialog):
     """
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardCharactersDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,17 @@
 from PyQt6.QtCore import QRegularExpression
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import (
-    QWidget,
+    QComboBox,
     QDialog,
-    QVBoxLayout,
     QHBoxLayout,
-    QScrollArea,
+    QLabel,
+    QLineEdit,
     QPushButton,
-    QSpacerItem,
+    QScrollArea,
     QSizePolicy,
-    QComboBox,
-    QLineEdit,
-    QLabel,
+    QSpacerItem,
+    QVBoxLayout,
+    QWidget,
 )

 from .Ui_QRegularExpressionWizardCharactersDialog import (
--- a/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,32 +7,30 @@
 Module implementing the QRegularExpression wizard dialog.
 """

+import json
 import os
 import pathlib
 import re
-import json

-from PyQt6.QtCore import pyqtSlot, QProcess, QByteArray
+from PyQt6.QtCore import QByteArray, QProcess, pyqtSlot
 from PyQt6.QtGui import QClipboard, QTextCursor
 from PyQt6.QtWidgets import (
-    QWidget,
+    QApplication,
     QDialog,
+    QDialogButtonBox,
     QInputDialog,
-    QApplication,
-    QDialogButtonBox,
+    QTableWidgetItem,
     QVBoxLayout,
-    QTableWidgetItem,
+    QWidget,
 )

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow

 from .Ui_QRegularExpressionWizardDialog import Ui_QRegularExpressionWizardDialog

-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Globals, Preferences, Utilities
-

 class QRegularExpressionWizardWidget(QWidget, Ui_QRegularExpressionWizardDialog):
     """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/AddEntryPointDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/AddEntryPointDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,12 +12,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog

 from .Ui_AddEntryPointDialog import Ui_AddEntryPointDialog

-from eric7.EricGui import EricPixmapCache
-

 class AddEntryPointDialog(QDialog, Ui_AddEntryPointDialog):
     """
--- a/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Plugins/WizardPlugins/SetupWizard/SetupWizardDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,22 +14,20 @@
 import pathlib

 import tomlkit
-
 import trove_classifiers

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem, QListWidgetItem
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, QTreeWidgetItem

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .AddEntryPointDialog import AddEntryPointDialog
 from .AddProjectUrlDialog import AddProjectUrlDialog
 from .Ui_SetupWizardDialog import Ui_SetupWizardDialog

-from eric7 import Preferences, Utilities
-

 class SetupWizardDialog(QDialog, Ui_SetupWizardDialog):
     """
--- a/src/eric7/Preferences/ConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,38 +13,33 @@
 import time
 import types

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QMetaObject, QRect
+from PyQt6.QtCore import QMetaObject, QRect, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtWidgets import (
-    QSizePolicy,
-    QSpacerItem,
-    QWidget,
-    QTreeWidget,
-    QStackedWidget,
+    QAbstractScrollArea,
+    QApplication,
     QDialog,
-    QSplitter,
-    QScrollArea,
-    QApplication,
     QDialogButtonBox,
     QFrame,
-    QVBoxLayout,
+    QLabel,
+    QLineEdit,
+    QScrollArea,
+    QSizePolicy,
+    QSpacerItem,
+    QSplitter,
+    QStackedWidget,
+    QTreeWidget,
     QTreeWidgetItem,
-    QLabel,
-    QAbstractScrollArea,
-    QLineEdit,
+    QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
-
-from eric7.Globals import isMacPlatform, getWebBrowserSupport
-
-from eric7 import Preferences
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Globals import getConfig
+from eric7.Globals import getConfig, getWebBrowserSupport, isMacPlatform


 class ConfigurationPageItem(QTreeWidgetItem):
@@ -1102,6 +1097,7 @@
         Private method to initialize the dictionary of preferences lexers.
         """
         from eric7.QScintilla import Lexers
+
         from .PreferencesLexer import PreferencesLexer, PreferencesLexerLanguageError

         self.lexers = {}
--- a/src/eric7/Preferences/ConfigurationPages/ApplicationPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ApplicationPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 import multiprocessing

+from eric7 import Globals, Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ApplicationPage import Ui_ApplicationPage

-from eric7 import Globals, Preferences
-

 class ApplicationPage(ConfigurationPageBase, Ui_ApplicationPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/CondaPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/CondaPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the conda configuration page.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_CondaPage import Ui_CondaPage

-from eric7 import Preferences
-

 class CondaPage(ConfigurationPageBase, Ui_CondaPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ConfigurationPageBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the base class for all configuration pages.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal
-from PyQt6.QtGui import QIcon, QPixmap, QColor
-from PyQt6.QtWidgets import QWidget, QColorDialog, QFontDialog, QDialog
+from PyQt6.QtCore import pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QColor, QIcon, QPixmap
+from PyQt6.QtWidgets import QColorDialog, QDialog, QFontDialog, QWidget


 class ConfigurationPageBase(QWidget):
--- a/src/eric7/Preferences/ConfigurationPages/CooperationPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/CooperationPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,14 @@
 Module implementing the Cooperation configuration page.
 """

-from PyQt6.QtCore import pyqtSlot, QRegularExpression
+from PyQt6.QtCore import QRegularExpression, pyqtSlot
 from PyQt6.QtGui import QRegularExpressionValidator, QValidator

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_CooperationPage import Ui_CooperationPage

-from eric7 import Preferences
-

 class CooperationPage(ConfigurationPageBase, Ui_CooperationPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/CorbaPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/CorbaPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the Corba configuration page.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_CorbaPage import Ui_CorbaPage

-from eric7 import Preferences
-

 class CorbaPage(ConfigurationPageBase, Ui_CorbaPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/DebuggerGeneralPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,20 +10,19 @@
 import re
 import socket

-from PyQt6.QtCore import pyqtSlot, Qt, QAbstractItemModel, QModelIndex
+from PyQt6.QtCore import QAbstractItemModel, QModelIndex, Qt, pyqtSlot
 from PyQt6.QtGui import QBrush, QColor
-from PyQt6.QtWidgets import QLineEdit, QInputDialog
-from PyQt6.QtNetwork import QNetworkInterface, QAbstractSocket, QHostAddress
+from PyQt6.QtNetwork import QAbstractSocket, QHostAddress, QNetworkInterface
+from PyQt6.QtWidgets import QInputDialog, QLineEdit

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets.EricCompleters import EricFileCompleter, EricDirCompleter
-from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricCompleters import EricDirCompleter, EricFileCompleter

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_DebuggerGeneralPage import Ui_DebuggerGeneralPage

-from eric7 import Preferences, Utilities
-

 class DebuggerGeneralPage(ConfigurationPageBase, Ui_DebuggerGeneralPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/DebuggerPython3Page.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,14 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_DebuggerPython3Page import Ui_DebuggerPython3Page

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class DebuggerPython3Page(ConfigurationPageBase, Ui_DebuggerPython3Page):
     """
--- a/src/eric7/Preferences/ConfigurationPages/DiffColoursPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/DiffColoursPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QColorDialog

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_DiffColoursPage import Ui_DiffColoursPage

-from eric7 import Preferences
-

 class DiffColoursPage(ConfigurationPageBase, Ui_DiffColoursPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorAPIsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,16 +13,15 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAPIsPage import Ui_EditorAPIsPage

-from eric7 import Preferences, Utilities
-

 class EditorAPIsPage(ConfigurationPageBase, Ui_EditorAPIsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutoCompletionJediPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorAutoCompletionJediPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing the Jedi Auto-completion configuration page.
 """

+from eric7 import Preferences
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
 from .Ui_EditorAutoCompletionJediPage import Ui_EditorAutoCompletionJediPage

-from eric7 import Preferences
-

 class EditorAutoCompletionJediPage(
     ConfigurationPageBase, Ui_EditorAutoCompletionJediPage
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the Editor Autocompletion configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAutocompletionPage import Ui_EditorAutocompletionPage

-from eric7 import Preferences
-

 class EditorAutocompletionPage(ConfigurationPageBase, Ui_EditorAutocompletionPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorAutocompletionQScintillaPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorAutocompletionQScintillaPage import Ui_EditorAutocompletionQScintillaPage

-from eric7 import Preferences
-

 class EditorAutocompletionQScintillaPage(
     ConfigurationPageBase, Ui_EditorAutocompletionQScintillaPage
--- a/src/eric7/Preferences/ConfigurationPages/EditorCallTipsJediPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorCallTipsJediPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing the Jedi Calltips configuration page.
 """

+from eric7 import Preferences
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+
 from .Ui_EditorCallTipsJediPage import Ui_EditorCallTipsJediPage

-from eric7 import Preferences
-

 class EditorCallTipsJediPage(ConfigurationPageBase, Ui_EditorCallTipsJediPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorCalltipsPage import Ui_EditorCalltipsPage

-from eric7 import Preferences
-

 class EditorCalltipsPage(ConfigurationPageBase, Ui_EditorCalltipsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorCalltipsQScintillaPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorCalltipsQScintillaPage import Ui_EditorCalltipsQScintillaPage

-from eric7 import Preferences
-

 class EditorCalltipsQScintillaPage(
     ConfigurationPageBase, Ui_EditorCalltipsQScintillaPage
--- a/src/eric7/Preferences/ConfigurationPages/EditorDocViewerPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorDocViewerPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the Editor Documentation Viewer configuration page.
 """

+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorDocViewerPage import Ui_EditorDocViewerPage

-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7 import Preferences
-

 class EditorDocViewerPage(ConfigurationPageBase, Ui_EditorDocViewerPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QFontDialog

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorExportersPage import Ui_EditorExportersPage

-from eric7 import Preferences
-

 class EditorExportersPage(ConfigurationPageBase, Ui_EditorExportersPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorFilePage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorFilePage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,19 +9,18 @@

 import sys

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QListWidgetItem, QInputDialog, QLineEdit
-from PyQt6.Qsci import QsciScintilla
+from PyQt6.QtWidgets import QInputDialog, QLineEdit, QListWidgetItem

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Utilities import supportedCodecs

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorFilePage import Ui_EditorFilePage

-from eric7 import Globals, Preferences
-from eric7.Utilities import supportedCodecs
-

 class EditorFilePage(ConfigurationPageBase, Ui_EditorFilePage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorGeneralPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,18 @@
 Module implementing the Editor General configuration page.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QTreeWidgetItem, QHeaderView, QDialog
 from PyQt6.Qsci import QsciScintillaBase
-
-from eric7.EricWidgets import EricMessageBox
-
-from .ConfigurationPageBase import ConfigurationPageBase
-from .Ui_EditorGeneralPage import Ui_EditorGeneralPage
-from .EditorLanguageTabIndentOverrideDialog import EditorLanguageTabIndentOverrideDialog
-
-from eric7.QScintilla.DocstringGenerator import getSupportedDocstringTypes
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.QScintilla.DocstringGenerator import getSupportedDocstringTypes
+
+from .ConfigurationPageBase import ConfigurationPageBase
+from .EditorLanguageTabIndentOverrideDialog import EditorLanguageTabIndentOverrideDialog
+from .Ui_EditorGeneralPage import Ui_EditorGeneralPage


 class EditorGeneralPage(ConfigurationPageBase, Ui_EditorGeneralPage):
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightersPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,16 +10,15 @@
 import os

 from pygments.lexers import get_all_lexers
-
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QHeaderView, QTreeWidgetItem

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorHighlightersPage import Ui_EditorHighlightersPage

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class EditorHighlightersPage(ConfigurationPageBase, Ui_EditorHighlightersPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,24 +9,23 @@

 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt, QFile, QIODevice
-from PyQt6.QtGui import QFont, QColor
+from PyQt6.QtCore import QFile, QIODevice, Qt, pyqtSlot
+from PyQt6.QtGui import QColor, QFont
 from PyQt6.QtWidgets import (
     QColorDialog,
+    QDialog,
     QFontDialog,
     QInputDialog,
     QMenu,
     QTreeWidgetItem,
-    QDialog,
 )

+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+
+from ..SubstyleDefinitionDialog import SubstyleDefinitionDialog
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorHighlightingStylesPage import Ui_EditorHighlightingStylesPage
-from ..SubstyleDefinitionDialog import SubstyleDefinitionDialog
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from eric7.EricGui import EricPixmapCache


 class EditorHighlightingStylesPage(
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to select the styles to be imported/exported.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem, QAbstractButton
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox, QListWidgetItem

 from .Ui_EditorHighlightingStylesSelectionDialog import (
     Ui_EditorHighlightingStylesSelectionDialog,
--- a/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorKeywordsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorKeywordsPage import Ui_EditorKeywordsPage

-from eric7 import Preferences
-

 class EditorKeywordsPage(ConfigurationPageBase, Ui_EditorKeywordsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorLanguageTabIndentOverrideDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,6 @@
 """

 from pygments.lexers import get_all_lexers
-
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
--- a/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerJediPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerJediPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,15 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
 from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
     ConfigurationPageBase,
 )
+from eric7.Preferences.MouseClickDialog import MouseClickDialog
+from eric7.Utilities import MouseUtilities

 from .Ui_EditorMouseClickHandlerJediPage import Ui_EditorMouseClickHandlerJediPage

-from eric7.Utilities import MouseUtilities
-
-from eric7 import Preferences
-from eric7.Preferences.MouseClickDialog import MouseClickDialog
-

 class EditorMouseClickHandlerJediPage(
     ConfigurationPageBase, Ui_EditorMouseClickHandlerJediPage
--- a/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorMouseClickHandlerPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the Editor Mouse Click Handlers configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorMouseClickHandlerPage import Ui_EditorMouseClickHandlerPage

-from eric7 import Preferences
-

 class EditorMouseClickHandlerPage(
     ConfigurationPageBase, Ui_EditorMouseClickHandlerPage
--- a/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorPropertiesPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.Qsci import QsciLexerPython

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorPropertiesPage import Ui_EditorPropertiesPage

-from eric7 import Preferences
-

 class EditorPropertiesPage(ConfigurationPageBase, Ui_EditorPropertiesPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorSearchPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the Editor Search configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSearchPage import Ui_EditorSearchPage

-from eric7 import Preferences
-

 class EditorSearchPage(ConfigurationPageBase, Ui_EditorSearchPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorSpellCheckingPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the Editor Spellchecking configuration page.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSpellCheckingPage import Ui_EditorSpellCheckingPage

-from eric7 import Preferences
-

 class EditorSpellCheckingPage(ConfigurationPageBase, Ui_EditorSpellCheckingPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,16 @@
 Module implementing the Editor Styles configuration page.
 """

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QColorDialog, QFontDialog
-from PyQt6.Qsci import QsciScintilla
+
+from eric7 import Preferences

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorStylesPage import Ui_EditorStylesPage

-from eric7 import Preferences
-

 class EditorStylesPage(ConfigurationPageBase, Ui_EditorStylesPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorSyntaxPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorSyntaxPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the Editor Syntax Checker configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorSyntaxPage import Ui_EditorSyntaxPage

-from eric7 import Preferences
-

 class EditorSyntaxPage(ConfigurationPageBase, Ui_EditorSyntaxPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorTypingPage import Ui_EditorTypingPage

-from eric7 import Preferences
-

 class EditorTypingPage(ConfigurationPageBase, Ui_EditorTypingPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/EmailPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EmailPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,8 +13,8 @@
 from PyQt6.QtCore import pyqtSlot

 from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EmailPage import Ui_EmailPage
--- a/src/eric7/Preferences/ConfigurationPages/GraphicsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/GraphicsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_GraphicsPage import Ui_GraphicsPage

-from eric7 import Preferences
-

 class GraphicsPage(ConfigurationPageBase, Ui_GraphicsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/HelpDocumentationPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the Help Documentation configuration page.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpDocumentationPage import Ui_HelpDocumentationPage

-from eric7 import Preferences
-

 class HelpDocumentationPage(ConfigurationPageBase, Ui_HelpDocumentationPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/HelpViewersPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,13 @@

 from PyQt6.QtWidgets import QButtonGroup

+from eric7 import Preferences
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 from eric7.Globals import getWebBrowserSupport

-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HelpViewersPage import Ui_HelpViewersPage

-from eric7 import Preferences
-

 class HelpViewersPage(ConfigurationPageBase, Ui_HelpViewersPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/HexEditorPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/HexEditorPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,11 +11,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QFontDialog

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_HexEditorPage import Ui_HexEditorPage

-from eric7 import Preferences
-

 class HexEditorPage(ConfigurationPageBase, Ui_HexEditorPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/IconsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/IconsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,16 +12,14 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QListWidgetItem

+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import getConfig

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_IconsPage import Ui_IconsPage

-from eric7 import Preferences
-
-from eric7.Globals import getConfig
-

 class IconsPage(ConfigurationPageBase, Ui_IconsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/IconsPreviewDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import os.path

-from PyQt6.QtCore import pyqtSlot, QDir
+from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtGui import QIcon, QPalette
-from PyQt6.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from .Ui_IconsPreviewDialog import Ui_IconsPreviewDialog
--- a/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,16 +13,14 @@
 from PyQt6.QtCore import QTranslator
 from PyQt6.QtWidgets import QStyleFactory

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import getConfig

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_InterfaceLightPage import Ui_InterfaceLightPage

-from eric7 import Preferences, Utilities
-
-from eric7.Globals import getConfig
-

 class InterfaceLightPage(ConfigurationPageBase, Ui_InterfaceLightPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,21 +10,19 @@
 import glob
 import os

-from PyQt6.QtCore import pyqtSlot, QTranslator
-from PyQt6.QtWidgets import QStyleFactory, QDialog, QColorDialog
+from PyQt6.QtCore import QTranslator, pyqtSlot
+from PyQt6.QtWidgets import QColorDialog, QDialog, QStyleFactory

-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
-from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import getConfig

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_InterfacePage import Ui_InterfacePage

-from eric7 import Preferences, Utilities
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Globals import getConfig
-

 class InterfacePage(ConfigurationPageBase, Ui_InterfacePage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/IrcPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/IrcPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the IRC configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_IrcPage import Ui_IrcPage

-from eric7 import Preferences
-

 class IrcPage(ConfigurationPageBase, Ui_IrcPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/LogViewerPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/LogViewerPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QColor

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_LogViewerPage import Ui_LogViewerPage

-from eric7 import Preferences
-

 class LogViewerPage(ConfigurationPageBase, Ui_LogViewerPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/MicroPythonPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,13 @@
 Module implementing the MicroPython configuration page.
 """

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.MicroPython.MicroPythonWidget import AnsiColorSchemes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_MicroPythonPage import Ui_MicroPythonPage

-from eric7 import Preferences, Utilities
-
-from eric7.MicroPython.MicroPythonWidget import AnsiColorSchemes
-

 class MicroPythonPage(ConfigurationPageBase, Ui_MicroPythonPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/MimeTypesPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/MimeTypesPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_MimeTypesPage import Ui_MimeTypesPage

-from eric7 import Preferences
-

 class MimeTypesPage(ConfigurationPageBase, Ui_MimeTypesPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/MultiProjectPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/MultiProjectPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the Multi Project configuration page.
 """

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_MultiProjectPage import Ui_MultiProjectPage

-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-
-from eric7 import Preferences, Utilities
-

 class MultiProjectPage(ConfigurationPageBase, Ui_MultiProjectPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/NetworkPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/NetworkPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,13 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+from eric7.EricNetwork.EricFtp import EricFtpProxyType
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

-from eric7.EricNetwork.EricFtp import EricFtpProxyType
-
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NetworkPage import Ui_NetworkPage

-from eric7 import Preferences
-

 class NetworkPage(ConfigurationPageBase, Ui_NetworkPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/NotificationsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/NotificationsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,16 @@
 Module implementing the Notifications configuration page.
 """

-from PyQt6.QtCore import pyqtSlot, QPoint
+from PyQt6.QtCore import QPoint, pyqtSlot
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QApplication, QColorDialog

+from eric7 import Preferences
+from eric7.UI.NotificationWidget import NotificationFrame, NotificationTypes
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_NotificationsPage import Ui_NotificationsPage

-from eric7 import Preferences
-
-from eric7.UI.NotificationWidget import NotificationFrame, NotificationTypes
-

 class NotificationsPage(ConfigurationPageBase, Ui_NotificationsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/PipPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/PipPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Package implementing the pip configuration page.
 """

+from eric7 import Preferences
+from eric7.PipInterface.Pip import Pip
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PipPage import Ui_PipPage

-from eric7.PipInterface.Pip import Pip
-
-from eric7 import Preferences
-

 class PipPage(ConfigurationPageBase, Ui_PipPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/PluginManagerPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PluginManagerPage import Ui_PluginManagerPage

-from eric7 import Preferences
-

 class PluginManagerPage(ConfigurationPageBase, Ui_PluginManagerPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/PrinterPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/PrinterPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PrinterPage import Ui_PrinterPage

-from eric7 import Preferences
-

 class PrinterPage(ConfigurationPageBase, Ui_PrinterPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ProjectBrowserPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProjectBrowserPage import Ui_ProjectBrowserPage

-from eric7 import Preferences
-

 class ProjectBrowserPage(ConfigurationPageBase, Ui_ProjectBrowserPage):
     """
@@ -98,13 +97,13 @@
         @param projectType type of the selected project (string)
         """
         from eric7.Project.ProjectBrowserFlags import (
-            SourcesBrowserFlag,
             FormsBrowserFlag,
-            ResourcesBrowserFlag,
-            TranslationsBrowserFlag,
             InterfacesBrowserFlag,
             OthersBrowserFlag,
             ProtocolsBrowserFlag,
+            ResourcesBrowserFlag,
+            SourcesBrowserFlag,
+            TranslationsBrowserFlag,
         )

         flags = 0
@@ -136,13 +135,13 @@
         @param projectType type of the selected project (string)
         """
         from eric7.Project.ProjectBrowserFlags import (
-            SourcesBrowserFlag,
             FormsBrowserFlag,
-            ResourcesBrowserFlag,
-            TranslationsBrowserFlag,
             InterfacesBrowserFlag,
             OthersBrowserFlag,
             ProtocolsBrowserFlag,
+            ResourcesBrowserFlag,
+            SourcesBrowserFlag,
+            TranslationsBrowserFlag,
         )

         flags = self.__projectBrowserFlags[projectType]
--- a/src/eric7/Preferences/ConfigurationPages/ProjectPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ProjectPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the Project configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProjectPage import Ui_ProjectPage

-from eric7 import Preferences
-

 class ProjectPage(ConfigurationPageBase, Ui_ProjectPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/ProtobufPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ProtobufPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing the protobuf configuration page.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ProtobufPage import Ui_ProtobufPage

-from eric7 import Preferences
-

 class ProtobufPage(ConfigurationPageBase, Ui_ProtobufPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/PythonPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/PythonPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+from eric7.Utilities import supportedCodecs
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_PythonPage import Ui_PythonPage

-from eric7 import Preferences
-from eric7.Utilities import supportedCodecs
-

 class PythonPage(ConfigurationPageBase, Ui_PythonPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/QtPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/QtPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,14 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_QtPage import Ui_QtPage

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class QtPage(ConfigurationPageBase, Ui_QtPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/SecurityPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/SecurityPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_SecurityPage import Ui_SecurityPage

-from eric7 import Preferences
-

 class SecurityPage(ConfigurationPageBase, Ui_SecurityPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/ShellPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ShellPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QFontDialog

+from eric7 import Preferences
+from eric7.QScintilla.Shell import ShellHistoryStyle
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ShellPage import Ui_ShellPage

-from eric7 import Preferences
-
-from eric7.QScintilla.Shell import ShellHistoryStyle
-

 class ShellPage(ConfigurationPageBase, Ui_ShellPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/TasksPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/TasksPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtGui import QColor

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TasksPage import Ui_TasksPage

-from eric7 import Preferences
-

 class TasksPage(ConfigurationPageBase, Ui_TasksPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/TemplatesPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/TemplatesPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QFontDialog

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TemplatesPage import Ui_TemplatesPage

-from eric7 import Preferences
-

 class TemplatesPage(ConfigurationPageBase, Ui_TemplatesPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/TrayStarterPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/TrayStarterPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 import os

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_TrayStarterPage import Ui_TrayStarterPage

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class TrayStarterPage(ConfigurationPageBase, Ui_TrayStarterPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/VcsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/VcsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing the VCS configuration page.
 """

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_VcsPage import Ui_VcsPage

-from eric7 import Preferences
-

 class VcsPage(ConfigurationPageBase, Ui_VcsPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/ViewmanagerPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_ViewmanagerPage import Ui_ViewmanagerPage

-from eric7 import Preferences
-

 class ViewmanagerPage(ConfigurationPageBase, Ui_ViewmanagerPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserAppearancePage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 from PyQt6.QtGui import QFont

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserAppearancePage import Ui_WebBrowserAppearancePage

-from eric7 import Preferences
-

 class WebBrowserAppearancePage(ConfigurationPageBase, Ui_WebBrowserAppearancePage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,14 @@
 Module implementing the  Web Browser configuration page.
 """

-from PyQt6.QtCore import pyqtSlot, QLocale
+from PyQt6.QtCore import QLocale, pyqtSlot
+
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache

 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserPage import Ui_WebBrowserPage

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class WebBrowserPage(ConfigurationPageBase, Ui_WebBrowserPage):
     """
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,17 @@
 Module implementing the Web Browser Spell Checking configuration page.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QDir, QLibraryInfo, QLocale
+from PyQt6.QtCore import QCoreApplication, QDir, QLibraryInfo, QLocale, Qt, pyqtSlot
 from PyQt6.QtWidgets import QListWidgetItem

+from eric7 import Globals, Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserSpellCheckingPage import Ui_WebBrowserSpellCheckingPage

-from eric7 import Globals, Preferences
-

 class WebBrowserSpellCheckingPage(
     ConfigurationPageBase, Ui_WebBrowserSpellCheckingPage
--- a/src/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/WebBrowserVirusTotalPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 from PyQt6.QtCore import pyqtSlot

+from eric7 import Preferences
+
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_WebBrowserVirusTotalPage import Ui_WebBrowserVirusTotalPage

-from eric7 import Preferences
-

 class WebBrowserVirusTotalPage(ConfigurationPageBase, Ui_WebBrowserVirusTotalPage):
     """
--- a/src/eric7/Preferences/HighlightingStylesFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/HighlightingStylesFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
-from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox


 class HighlightingStylesFile(QObject):
--- a/src/eric7/Preferences/MouseClickDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/MouseClickDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog for the configuration of a mouse click sequence.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_MouseClickDialog import Ui_MouseClickDialog
+from eric7.Utilities import MouseUtilities

-from eric7.Utilities import MouseUtilities
+from .Ui_MouseClickDialog import Ui_MouseClickDialog


 class MouseClickDialog(QDialog, Ui_MouseClickDialog):
--- a/src/eric7/Preferences/PreferencesLexer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/PreferencesLexer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a special QScintilla lexer to handle the preferences.
 """

+from PyQt6.Qsci import QsciScintillaBase
 from PyQt6.QtCore import QCoreApplication, QObject
-from PyQt6.Qsci import QsciScintillaBase

 from eric7 import Globals, Preferences
--- a/src/eric7/Preferences/ProgramsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ProgramsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,21 @@
 import os
 import re

-from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtCore import QProcess, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
     QApplication,
-    QTreeWidgetItem,
-    QHeaderView,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
+    QTreeWidgetItem,
 )

+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .Ui_ProgramsDialog import Ui_ProgramsDialog

-from eric7 import Globals, Preferences, Utilities
-

 class ProgramsDialog(QDialog, Ui_ProgramsDialog):
     """
--- a/src/eric7/Preferences/ShortcutDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ShortcutDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog for the configuration of a keyboard shortcut.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QEvent, QKeyCombination
+from PyQt6.QtCore import QEvent, QKeyCombination, Qt, pyqtSignal
 from PyQt6.QtGui import QKeySequence
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
--- a/src/eric7/Preferences/Shortcuts.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/Shortcuts.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 import contextlib

-from PyQt6.QtCore import QFile, QIODevice, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QFile, QIODevice
 from PyQt6.QtGui import QKeySequence

+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
 from eric7.Preferences import Prefs, syncPreferences
--- a/src/eric7/Preferences/ShortcutsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ShortcutsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,18 +10,17 @@

 import re

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QKeySequence
-from PyQt6.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

+from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
+from eric7.Preferences import Shortcuts

 from .Ui_ShortcutsDialog import Ui_ShortcutsDialog

-from eric7 import Preferences
-from eric7.Preferences import Shortcuts
-

 class ShortcutsDialog(QDialog, Ui_ShortcutsDialog):
     """
--- a/src/eric7/Preferences/ShortcutsFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ShortcutsFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,11 @@

 from PyQt6.QtCore import QObject

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-
 HelpViewer = typing.TypeVar("WebBrowserWindow")
--- a/src/eric7/Preferences/ThemeManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ThemeManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,8 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
 from eric7 import Globals, Preferences
-
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.Globals import getConfig
--- a/src/eric7/Preferences/ToolConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ToolConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,12 @@
 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_ToolConfigurationDialog import Ui_ToolConfigurationDialog

-from eric7 import Utilities
-

 class ToolConfigurationDialog(QDialog, Ui_ToolConfigurationDialog):
     """
--- a/src/eric7/Preferences/ViewProfileDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/ViewProfileDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QDialog

+from .Ui_ViewProfileSidebarsDialog import Ui_ViewProfileSidebarsDialog
 from .Ui_ViewProfileToolboxesDialog import Ui_ViewProfileToolboxesDialog
-from .Ui_ViewProfileSidebarsDialog import Ui_ViewProfileSidebarsDialog


 class ViewProfileDialog(QDialog):
--- a/src/eric7/Preferences/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Preferences/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -17,53 +17,49 @@
 """

 import ast
+import fnmatch
+import json
 import os
 import pathlib
-import fnmatch
 import shutil
-import json
-
-from PyQt6.Qsci import QsciScintilla, QsciLexerPython
+
+from PyQt6.Qsci import QsciLexerPython, QsciScintilla
 from PyQt6.QtCore import (
+    QByteArray,
+    QCoreApplication,
+    QDateTime,
     QDir,
-    QPoint,
+    QLibraryInfo,
     QLocale,
+    QPoint,
     QSettings,
-    QCoreApplication,
-    QByteArray,
     QSize,
+    Qt,
+    QtMsgType,
     QUrl,
-    Qt,
-    QLibraryInfo,
-    QDateTime,
-    QtMsgType,
 )
 from PyQt6.QtGui import QColor, QFont, QPalette
 from PyQt6.QtWidgets import QApplication

 try:
-    from PyQt6.QtWebEngineCore import QWebEngineSettings, QWebEngineProfile
+    from PyQt6.QtWebEngineCore import QWebEngineProfile, QWebEngineSettings
 except ImportError:
     QWebEngineSettings = None

+from eric7 import Globals
+from eric7.EricNetwork.EricFtp import EricFtpProxyType
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricIconBar import EricIconBar
-
-from eric7.EricNetwork.EricFtp import EricFtpProxyType
-
-from eric7 import Globals
-
 from eric7.Project.ProjectBrowserFlags import (
-    SourcesBrowserFlag,
+    AllBrowsersFlag,
     FormsBrowserFlag,
-    ResourcesBrowserFlag,
-    TranslationsBrowserFlag,
     InterfacesBrowserFlag,
     OthersBrowserFlag,
     ProtocolsBrowserFlag,
-    AllBrowsersFlag,
+    ResourcesBrowserFlag,
+    SourcesBrowserFlag,
+    TranslationsBrowserFlag,
 )
-
 from eric7.QScintilla.Shell import ShellHistoryStyle
--- a/src/eric7/Project/CreateDialogCodeDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/CreateDialogCodeDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,33 +7,29 @@
 Module implementing a dialog to generate code for a Qt5 dialog.
 """

-import os
+import contextlib
 import json
-import contextlib
+import os

 from PyQt6.QtCore import (
-    pyqtSlot,
-    Qt,
     QMetaObject,
-    QRegularExpression,
-    QSortFilterProxyModel,
     QProcess,
     QProcessEnvironment,
+    QRegularExpression,
+    QSortFilterProxyModel,
+    Qt,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QStandardItemModel, QStandardItem, QBrush, QColor
+from PyQt6.QtGui import QBrush, QColor, QStandardItem, QStandardItemModel
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-
-from eric7.EricWidgets.EricApplication import ericApp
+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
-
-from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog
-from .NewDialogClassDialog import NewDialogClassDialog
-
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig

-from eric7 import Globals, Preferences
-
+from .NewDialogClassDialog import NewDialogClassDialog
+from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog

 pyqtSignatureRole = Qt.ItemDataRole.UserRole + 1
 pythonSignatureRole = Qt.ItemDataRole.UserRole + 2
--- a/src/eric7/Project/DebuggerPropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/DebuggerPropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,19 +10,16 @@
 import os

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QDialog, QComboBox
-
-from eric7.EricWidgets.EricCompleters import EricDirCompleter
-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_DebuggerPropertiesDialog import Ui_DebuggerPropertiesDialog
-
-
-from eric7.Globals import getConfig
+from PyQt6.QtWidgets import QComboBox, QDialog

 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricCompleters import EricDirCompleter
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import getConfig
+
+from .Ui_DebuggerPropertiesDialog import Ui_DebuggerPropertiesDialog


 class DebuggerPropertiesDialog(QDialog, Ui_DebuggerPropertiesDialog):
--- a/src/eric7/Project/DebuggerPropertiesFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/DebuggerPropertiesFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,10 +14,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
-from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox

 Project = typing.TypeVar("Project")
--- a/src/eric7/Project/FiletypeAssociationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/FiletypeAssociationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import contextlib

 from PyQt6.QtCore import Qt, pyqtSlot
-from PyQt6.QtWidgets import QHeaderView, QDialog, QTreeWidgetItem
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

 from .Ui_FiletypeAssociationDialog import Ui_FiletypeAssociationDialog
--- a/src/eric7/Project/IdlCompilerOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/IdlCompilerOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,15 @@
 Module implementing a dialog to enter some IDL compiler options.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QInputDialog
-
-from .Ui_IdlCompilerOptionsDialog import Ui_IdlCompilerOptionsDialog
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QInputDialog, QTreeWidgetItem

 from eric7.EricGui import EricPixmapCache
-
 from eric7.EricWidgets import EricPathPickerDialog
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .IdlCompilerDefineNameDialog import IdlCompilerDefineNameDialog
+from .Ui_IdlCompilerOptionsDialog import Ui_IdlCompilerOptionsDialog


 class IdlCompilerOptionsDialog(QDialog, Ui_IdlCompilerOptionsDialog):
--- a/src/eric7/Project/LexerAssociationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/LexerAssociationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,14 +10,13 @@
 import os

 from PyQt6.QtCore import Qt, pyqtSlot
-from PyQt6.QtWidgets import QHeaderView, QTreeWidgetItem, QDialog
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem
+
+from eric7.EricGui import EricPixmapCache
+from eric7.QScintilla import Lexers

 from .Ui_LexerAssociationDialog import Ui_LexerAssociationDialog

-from eric7.QScintilla import Lexers
-
-from eric7.EricGui import EricPixmapCache
-

 class LexerAssociationDialog(QDialog, Ui_LexerAssociationDialog):
     """
--- a/src/eric7/Project/NewPythonPackageDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/NewPythonPackageDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to add a new Python package.
 """

+from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
-from PyQt6.QtCore import pyqtSlot

 from .Ui_NewPythonPackageDialog import Ui_NewPythonPackageDialog
--- a/src/eric7/Project/Project.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/Project.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,49 +18,41 @@
 import time
 import zipfile

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import (
-    pyqtSlot,
+    QByteArray,
+    QCryptographicHash,
     QFile,
-    pyqtSignal,
-    QCryptographicHash,
     QIODevice,
-    QByteArray,
     QObject,
     QProcess,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QKeySequence, QAction
-from PyQt6.QtWidgets import QLineEdit, QToolBar, QDialog, QInputDialog, QMenu
-from PyQt6.Qsci import QsciScintilla
-
+from PyQt6.QtGui import QAction, QKeySequence
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu, QToolBar
+
+from eric7 import Globals, Preferences, Utilities
+from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
+from eric7.CodeFormatting.BlackUtilities import aboutBlack
+from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
+from eric7.CodeFormatting.IsortUtilities import aboutIsort
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
-
 from eric7.Globals import recentNameProject
-
-from eric7.EricGui import EricPixmapCache
+from eric7.Sessions.SessionFile import SessionFile
+from eric7.Tasks.TasksFile import TasksFile
 from eric7.UI import Config
 from eric7.UI.NotificationWidget import NotificationTypes

-from eric7.EricGui.EricAction import EricAction, createActionGroup
-
-from eric7 import Globals, Preferences, Utilities
-
+from .DebuggerPropertiesFile import DebuggerPropertiesFile
 from .ProjectFile import ProjectFile
 from .UserProjectFile import UserProjectFile
-from .DebuggerPropertiesFile import DebuggerPropertiesFile
-
-from eric7.Sessions.SessionFile import SessionFile
-
-from eric7.Tasks.TasksFile import TasksFile
-
-from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
-from eric7.CodeFormatting.BlackUtilities import aboutBlack
-
-from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
-from eric7.CodeFormatting.IsortUtilities import aboutIsort


 class Project(QObject):
@@ -7000,6 +6992,7 @@
         @type bool (optional)
         """
         from eric7.VirtualEnv.VirtualenvExecDialog import VirtualenvExecDialog
+
         from .ProjectVenvCreationParametersDialog import (
             ProjectVenvCreationParametersDialog,
         )
--- a/src/eric7/Project/ProjectBaseBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectBaseBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,31 +7,30 @@
 Module implementing the baseclass for the various project browsers.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import (
-    QModelIndex,
-    pyqtSignal,
-    Qt,
     QCoreApplication,
-    QItemSelectionModel,
-    QItemSelection,
     QElapsedTimer,
+    QItemSelection,
+    QItemSelectionModel,
+    QModelIndex,
+    Qt,
+    pyqtSignal,
 )
-from PyQt6.QtWidgets import QTreeView, QApplication, QMenu, QDialog, QAbstractItemView
+from PyQt6.QtWidgets import QAbstractItemView, QApplication, QDialog, QMenu, QTreeView

+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
 from eric7.UI.Browser import Browser
 from eric7.UI.BrowserModel import BrowserDirectoryItem, BrowserFileItem

 from .ProjectBrowserModel import (
-    ProjectBrowserSimpleDirectoryItem,
     ProjectBrowserDirectoryItem,
     ProjectBrowserFileItem,
+    ProjectBrowserSimpleDirectoryItem,
 )
 from .ProjectBrowserSortFilterProxyModel import ProjectBrowserSortFilterProxyModel
--- a/src/eric7/Project/ProjectBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,21 +11,20 @@
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QApplication

-from eric7.EricWidgets.EricTabWidget import EricTabWidget
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricLed import EricClickableLed
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
+from eric7.EricWidgets.EricTabWidget import EricTabWidget

 from .ProjectBrowserFlags import (
-    SourcesBrowserFlag,
+    AllBrowsersFlag,
     FormsBrowserFlag,
-    ResourcesBrowserFlag,
-    TranslationsBrowserFlag,
     InterfacesBrowserFlag,
     OthersBrowserFlag,
     ProtocolsBrowserFlag,
-    AllBrowsersFlag,
+    ResourcesBrowserFlag,
+    SourcesBrowserFlag,
+    TranslationsBrowserFlag,
 )


@@ -78,13 +77,13 @@
         self.__vcsStateChanged(" ")

         # step 1: create all the individual browsers
-        from .ProjectSourcesBrowser import ProjectSourcesBrowser
         from .ProjectFormsBrowser import ProjectFormsBrowser
-        from .ProjectTranslationsBrowser import ProjectTranslationsBrowser
-        from .ProjectResourcesBrowser import ProjectResourcesBrowser
         from .ProjectInterfacesBrowser import ProjectInterfacesBrowser
         from .ProjectOthersBrowser import ProjectOthersBrowser
         from .ProjectProtocolsBrowser import ProjectProtocolsBrowser
+        from .ProjectResourcesBrowser import ProjectResourcesBrowser
+        from .ProjectSourcesBrowser import ProjectSourcesBrowser
+        from .ProjectTranslationsBrowser import ProjectTranslationsBrowser

         # sources browser
         self.psBrowser = ProjectSourcesBrowser(self.project)
--- a/src/eric7/Project/ProjectBrowserModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectBrowserModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,23 +7,21 @@
 Module implementing the browser model.
 """

+import contextlib
 import os
 import re
-import contextlib

-from PyQt6.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt
+from PyQt6.QtCore import QDir, QFileSystemWatcher, QModelIndex, Qt, pyqtSignal
 from PyQt6.QtGui import QColor

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.UI.BrowserModel import (
-    BrowserModel,
-    BrowserItem,
     BrowserDirectoryItem,
     BrowserFileItem,
+    BrowserItem,
+    BrowserModel,
 )
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-
 from eric7.Utilities import ModuleParser

 ProjectBrowserItemSimpleDirectory = 100
--- a/src/eric7/Project/ProjectBrowserSortFilterProxyModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectBrowserSortFilterProxyModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 import contextlib

+from eric7 import Preferences
 from eric7.UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
+
 from .ProjectBrowserModel import ProjectBrowserSourceType

-from eric7 import Preferences
-

 class ProjectBrowserSortFilterProxyModel(BrowserSortFilterProxyModel):
     """
--- a/src/eric7/Project/ProjectFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,10 +15,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences, Utilities
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
-from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox

 Project = typing.TypeVar("Project")
--- a/src/eric7/Project/ProjectFormsBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectFormsBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,34 +7,30 @@
 Module implementing a class used to display the forms part of the project.
 """

+import contextlib
 import os
-import sys
-import shutil
-import contextlib
 import pathlib
+import shutil
+import sys

-from PyQt6.QtCore import QThread, pyqtSignal, QProcess
-from PyQt6.QtWidgets import QDialog, QInputDialog, QApplication, QMenu
+from PyQt6.QtCore import QProcess, QThread, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QMenu

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
-
-from .ProjectBrowserModel import (
-    ProjectBrowserFileItem,
-    ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
-    ProjectBrowserFormType,
-)
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7.EricGui import EricPixmapCache
+from eric7.Globals import getConfig
 from eric7.UI.NotificationWidget import NotificationTypes

-
-from eric7 import Preferences, Utilities
-
-from eric7.Globals import getConfig
+from .ProjectBaseBrowser import ProjectBaseBrowser
+from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
+    ProjectBrowserFormType,
+    ProjectBrowserSimpleDirectoryItem,
+)


 class ProjectFormsBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectInterfacesBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectInterfacesBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,35 +8,33 @@
 of the project.
 """

-import os
+import contextlib
 import glob
-import contextlib
+import os

-from PyQt6.QtCore import QThread, pyqtSignal, QProcess
-from PyQt6.QtWidgets import QDialog, QApplication, QMenu
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from PyQt6.QtCore import QProcess, QThread, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu

-from .ProjectBrowserModel import (
-    ProjectBrowserFileItem,
-    ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
-    ProjectBrowserInterfaceType,
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from eric7.UI.BrowserModel import (
+    BrowserClassAttributeItem,
+    BrowserClassItem,
+    BrowserFileItem,
+    BrowserMethodItem,
 )
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7.UI.BrowserModel import (
-    BrowserFileItem,
-    BrowserClassItem,
-    BrowserMethodItem,
-    BrowserClassAttributeItem,
-)
-from eric7.EricGui import EricPixmapCache
 from eric7.UI.NotificationWidget import NotificationTypes

-from eric7 import Preferences, Utilities
+from .ProjectBaseBrowser import ProjectBaseBrowser
+from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
+    ProjectBrowserInterfaceType,
+    ProjectBrowserSimpleDirectoryItem,
+)


 class ProjectInterfacesBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectOthersBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectOthersBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,22 +11,21 @@
 import contextlib
 import os

-from PyQt6.QtCore import QModelIndex, pyqtSignal, QUrl
+from PyQt6.QtCore import QModelIndex, QUrl, pyqtSignal
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QDialog, QMenu

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.Utilities import MimeTypes

+from .ProjectBaseBrowser import ProjectBaseBrowser
 from .ProjectBrowserModel import (
-    ProjectBrowserFileItem,
-    ProjectBrowserSimpleDirectoryItem,
     ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
     ProjectBrowserOthersType,
+    ProjectBrowserSimpleDirectoryItem,
 )
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7.Utilities import MimeTypes
-from eric7 import Preferences


 class ProjectOthersBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectProtocolsBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectProtocolsBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,35 +8,33 @@
 of the project.
 """

-import os
+import contextlib
 import glob
-import contextlib
+import os

-from PyQt6.QtCore import QThread, pyqtSignal, QProcess
-from PyQt6.QtWidgets import QDialog, QApplication, QMenu
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from PyQt6.QtCore import QProcess, QThread, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu

-from .ProjectBrowserModel import (
-    ProjectBrowserFileItem,
-    ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
-    ProjectBrowserProtocolsType,
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from eric7.UI.BrowserModel import (
+    BrowserClassAttributeItem,
+    BrowserClassItem,
+    BrowserFileItem,
+    BrowserMethodItem,
 )
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7.UI.BrowserModel import (
-    BrowserFileItem,
-    BrowserClassItem,
-    BrowserMethodItem,
-    BrowserClassAttributeItem,
-)
-from eric7.EricGui import EricPixmapCache
 from eric7.UI.NotificationWidget import NotificationTypes

-from eric7 import Globals, Preferences, Utilities
+from .ProjectBaseBrowser import ProjectBaseBrowser
+from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
+    ProjectBrowserProtocolsType,
+    ProjectBrowserSimpleDirectoryItem,
+)


 class ProjectProtocolsBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectResourcesBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectResourcesBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,27 @@
 Module implementing a class used to display the resources part of the project.
 """

+import contextlib
 import os
-import contextlib
 import pathlib

-from PyQt6.QtCore import QThread, pyqtSignal, QProcess
-from PyQt6.QtWidgets import QDialog, QApplication, QMenu
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
+from PyQt6.QtCore import QProcess, QThread, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu

-from .ProjectBrowserModel import (
-    ProjectBrowserFileItem,
-    ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
-    ProjectBrowserResourceType,
-)
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
+from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
 from eric7.UI.NotificationWidget import NotificationTypes

-from eric7 import Preferences, Utilities
+from .ProjectBaseBrowser import ProjectBaseBrowser
+from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
+    ProjectBrowserResourceType,
+    ProjectBrowserSimpleDirectoryItem,
+)


 class ProjectResourcesBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectSourcesBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectSourcesBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,39 +7,35 @@
 Module implementing a class used to display the Sources part of the project.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import pyqtSignal
 from PyQt6.QtWidgets import QDialog, QInputDialog, QMenu

+from eric7 import Utilities
+from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
+from eric7.CodeFormatting.BlackUtilities import aboutBlack
+from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
+from eric7.CodeFormatting.IsortUtilities import aboutIsort
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
 from eric7.UI.BrowserModel import (
-    BrowserFileItem,
+    BrowserClassAttributeItem,
     BrowserClassItem,
+    BrowserFileItem,
+    BrowserImportItem,
     BrowserMethodItem,
-    BrowserClassAttributeItem,
-    BrowserImportItem,
 )

+from .ProjectBaseBrowser import ProjectBaseBrowser
 from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
     ProjectBrowserFileItem,
     ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
     ProjectBrowserSourceType,
 )
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7 import Utilities
-from eric7.EricGui import EricPixmapCache
-
-from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
-from eric7.CodeFormatting.BlackUtilities import aboutBlack
-
-from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
-from eric7.CodeFormatting.IsortUtilities import aboutIsort


 class ProjectSourcesBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectTranslationsBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectTranslationsBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,33 +8,30 @@
 project.
 """

-import os
-import shutil
+import contextlib
 import fnmatch
 import functools
-import contextlib
+import os
+import shutil

-from PyQt6.QtCore import pyqtSignal, Qt, QProcess, QEventLoop
-from PyQt6.QtGui import QGuiApplication, QCursor
+from PyQt6.QtCore import QEventLoop, QProcess, Qt, pyqtSignal
+from PyQt6.QtGui import QCursor, QGuiApplication
 from PyQt6.QtWidgets import QDialog, QMenu

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.UI.NotificationWidget import NotificationTypes

+from .ProjectBaseBrowser import ProjectBaseBrowser
 from .ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
     ProjectBrowserFileItem,
     ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserDirectoryItem,
     ProjectBrowserTranslationType,
 )
-from .ProjectBaseBrowser import ProjectBaseBrowser
-
-from eric7.EricGui import EricPixmapCache
-from eric7.UI.NotificationWidget import NotificationTypes
-
-from eric7 import Preferences, Utilities


 class ProjectTranslationsBrowser(ProjectBaseBrowser):
--- a/src/eric7/Project/ProjectVenvConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectVenvConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,12 +14,11 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Globals
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_ProjectVenvConfigurationDialog import Ui_ProjectVenvConfigurationDialog

-from eric7 import Globals
-

 class ProjectVenvConfigurationDialog(QDialog, Ui_ProjectVenvConfigurationDialog):
     """
--- a/src/eric7/Project/ProjectVenvCreationParametersDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/ProjectVenvCreationParametersDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,14 +10,13 @@

 from PyQt6.QtWidgets import QDialog

+from eric7 import Globals
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_ProjectVenvCreationParametersDialog import (
     Ui_ProjectVenvCreationParametersDialog,
 )

-from eric7 import Globals
-

 class ProjectVenvCreationParametersDialog(
     QDialog, Ui_ProjectVenvCreationParametersDialog
--- a/src/eric7/Project/PropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/PropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,18 +15,15 @@
 from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.QScintilla.DocstringGenerator import getSupportedDocstringTypes
+from eric7.Testing.Interfaces import FrameworkNames

 from .Ui_PropertiesDialog import Ui_PropertiesDialog

-from eric7.QScintilla.DocstringGenerator import getSupportedDocstringTypes
-
-from eric7.Testing.Interfaces import FrameworkNames
-
-from eric7 import Preferences, Utilities
-from eric7.EricGui import EricPixmapCache
-

 class PropertiesDialog(QDialog, Ui_PropertiesDialog):
     """
--- a/src/eric7/Project/QuickFindFileDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/QuickFindFileDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,13 @@

 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QHeaderView,
     QApplication,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
+    QWidget,
 )

 from .Ui_QuickFindFile import Ui_QuickFindFile
--- a/src/eric7/Project/SpellingPropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/SpellingPropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_SpellingPropertiesDialog import Ui_SpellingPropertiesDialog

-from eric7 import Preferences
-

 class SpellingPropertiesDialog(QDialog, Ui_SpellingPropertiesDialog):
     """
--- a/src/eric7/Project/TranslationPropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/TranslationPropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,16 +10,15 @@
 import os

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QListWidgetItem, QDialog, QDialogButtonBox
+from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QListWidgetItem

+from eric7 import Utilities
+from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricCompleters import EricFileCompleter
-from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_TranslationPropertiesDialog import Ui_TranslationPropertiesDialog

-from eric7 import Utilities
-

 class TranslationPropertiesDialog(QDialog, Ui_TranslationPropertiesDialog):
     """
--- a/src/eric7/Project/UicLoadUi5.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/UicLoadUi5.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,15 @@
 Module to get the object name, class name or signatures of a Qt form (*.ui).
 """

-import sys
+import contextlib
 import json
+import sys
 import xml.etree.ElementTree  # secok
-import contextlib

 try:
+    from PyQt5 import uic
     from PyQt5.QtCore import QByteArray, QMetaMethod
     from PyQt5.QtWidgets import QAction, QApplication, QWidget
-    from PyQt5 import uic
 except ModuleNotFoundError:
     print("PyQt5 could not be found.")
     sys.exit(1)
--- a/src/eric7/Project/UicLoadUi6.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/UicLoadUi6.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,17 @@
 Module to get the object name, class name or signatures of a Qt form (*.ui).
 """

+import contextlib
+import json
 import os
 import sys
-import json
 import xml.etree.ElementTree  # secok
-import contextlib

 try:
+    from PyQt6 import uic
     from PyQt6.QtCore import QByteArray, QMetaMethod
     from PyQt6.QtGui import QAction
     from PyQt6.QtWidgets import QApplication, QWidget
-    from PyQt6 import uic
 except ModuleNotFoundError:
     print("PyQt6 could not be found.")
     sys.exit(1)
--- a/src/eric7/Project/UserProjectFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/UserProjectFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,9 @@

 from PyQt6.QtCore import QObject

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-
-from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox

 Project = typing.TypeVar("Project")
--- a/src/eric7/Project/UserPropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Project/UserPropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,9 @@

 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-
 from .Ui_UserPropertiesDialog import Ui_UserPropertiesDialog
--- a/src/eric7/QScintilla/APIsManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/APIsManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,13 @@
 import os
 import pathlib

-from PyQt6.QtCore import pyqtSignal, QLibraryInfo, QObject
 from PyQt6.Qsci import QsciAPIs
+from PyQt6.QtCore import QLibraryInfo, QObject, pyqtSignal
+
+from eric7 import Globals, Preferences

 from . import Lexers

-from eric7 import Globals, Preferences
-

 class APIs(QObject):
     """
--- a/src/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/DocstringGenerator/BaseDocstringGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QMenu

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-

 def getIndentStr(text):
     """
--- a/src/eric7/QScintilla/DocstringGenerator/PyDocstringGenerator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/DocstringGenerator/PyDocstringGenerator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a docstring generator for Python.
 """

+import collections
 import re
-import collections

 from .BaseDocstringGenerator import BaseDocstringGenerator, FunctionInfo, getIndentStr
--- a/src/eric7/QScintilla/Editor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Editor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -17,48 +17,41 @@

 import editorconfig

+from PyQt6.Qsci import QsciMacro, QsciScintilla, QsciStyledText
 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
-    Qt,
+    QCryptographicHash,
+    QDateTime,
     QDir,
-    QTimer,
+    QEvent,
     QModelIndex,
-    QCryptographicHash,
-    QEvent,
-    QDateTime,
     QPoint,
     QSize,
+    Qt,
+    QTimer,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QPalette, QFont, QPixmap, QPainter, QActionGroup
-from PyQt6.QtWidgets import QLineEdit, QDialog, QInputDialog, QApplication, QMenu
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
-from PyQt6.Qsci import QsciScintilla, QsciMacro, QsciStyledText
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from eric7.EricUtilities.EricCache import EricCache
-
-from .QsciScintillaCompat import QsciScintillaCompat
-from .EditorMarkerMap import EditorMarkerMap
-from .SpellChecker import SpellChecker
-
-from eric7.Globals import recentNameBreakpointConditions
+from PyQt6.QtGui import QActionGroup, QFont, QPainter, QPalette, QPixmap
+from PyQt6.QtPrintSupport import QAbstractPrintDialog, QPrintDialog, QPrinter
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit, QMenu

 from eric7 import Preferences, Utilities
-from eric7.Utilities import MouseUtilities
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.UI import PythonDisViewer
-
 from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
 from eric7.CodeFormatting.BlackUtilities import aboutBlack
-
 from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
 from eric7.CodeFormatting.IsortUtilities import aboutIsort
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricUtilities.EricCache import EricCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import recentNameBreakpointConditions
+from eric7.UI import PythonDisViewer
+from eric7.Utilities import MouseUtilities
+
+from .EditorMarkerMap import EditorMarkerMap
+from .QsciScintillaCompat import QsciScintillaCompat
+from .SpellChecker import SpellChecker

 EditorAutoCompletionListID = 1
 TemplateCompletionListID = 2
@@ -2891,6 +2884,7 @@
         Public slot to show a print preview of the text.
         """
         from PyQt6.QtPrintSupport import QPrintPreviewDialog
+
         from .Printer import Printer

         printer = Printer(mode=QPrinter.PrinterMode.HighResolution)
--- a/src/eric7/QScintilla/EditorAssembly.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/EditorAssembly.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,12 @@
 import contextlib

 from PyQt6.QtCore import QTimer
-from PyQt6.QtWidgets import QWidget, QGridLayout, QComboBox
+from PyQt6.QtWidgets import QComboBox, QGridLayout, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class EditorAssembly(QWidget):
     """
@@ -49,8 +48,8 @@
         self.__layout.setContentsMargins(0, 0, 0, 0)
         self.__layout.setSpacing(1)

+        from .Editor import Editor
         from .EditorButtonsWidget import EditorButtonsWidget
-        from .Editor import Editor
         from .EditorOutline import EditorOutlineView

         self.__showOutline = Preferences.getEditor("ShowSourceOutline")
--- a/src/eric7/QScintilla/EditorButtonsWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/EditorButtonsWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,19 +10,19 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QToolButton,
     QFrame,
     QMenu,
+    QScrollArea,
     QSizePolicy,
-    QScrollArea,
+    QToolButton,
+    QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences

 from . import MarkupProviders
--- a/src/eric7/QScintilla/EditorMarkerMap.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/EditorMarkerMap.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,9 @@
 Module implementing a class for showing an editor marker map.
 """

+from eric7 import Preferences
 from eric7.EricWidgets.EricMapWidget import EricMapWidget

-from eric7 import Preferences
-

 class EditorMarkerMap(EricMapWidget):
     """
--- a/src/eric7/QScintilla/EditorOutline.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/EditorOutline.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,21 +10,20 @@
 import contextlib
 import functools

-from PyQt6.QtCore import pyqtSlot, Qt, QCoreApplication, QModelIndex, QPoint
-from PyQt6.QtWidgets import QTreeView, QAbstractItemView, QMenu, QApplication, QDialog
+from PyQt6.QtCore import QCoreApplication, QModelIndex, QPoint, Qt, pyqtSlot
+from PyQt6.QtWidgets import QAbstractItemView, QApplication, QDialog, QMenu, QTreeView

-from eric7.UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel
+from eric7 import Preferences
 from eric7.UI.BrowserModel import (
-    BrowserImportsItem,
+    BrowserClassAttributeItem,
     BrowserGlobalsItem,
-    BrowserClassAttributeItem,
     BrowserImportItem,
+    BrowserImportsItem,
 )
+from eric7.UI.BrowserSortFilterProxyModel import BrowserSortFilterProxyModel

 from .EditorOutlineModel import EditorOutlineModel

-from eric7 import Preferences
-

 class EditorOutlineView(QTreeView):
     """
--- a/src/eric7/QScintilla/EditorOutlineModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/EditorOutlineModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,25 +7,24 @@
 Module implementing the editor outline model.
 """

+import contextlib
 import os
-import contextlib

 from PyQt6.QtCore import QCoreApplication, QModelIndex

+from eric7 import Preferences
 from eric7.UI.BrowserModel import (
-    BrowserModel,
-    BrowserItem,
+    BrowserClassAttributesItem,
     BrowserClassItem,
     BrowserCodingItem,
     BrowserGlobalsItem,
+    BrowserImportItem,
     BrowserImportsItem,
-    BrowserImportItem,
-    BrowserClassAttributesItem,
+    BrowserItem,
     BrowserMethodItem,
+    BrowserModel,
 )

-from eric7 import Preferences
-

 class EditorOutlineModel(BrowserModel):
     """
--- a/src/eric7/QScintilla/Exporters/ExporterBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import pathlib

-from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricWidgets import EricFileDialog, EricMessageBox


 class ExporterBase(QObject):
--- a/src/eric7/QScintilla/Exporters/ExporterHTML.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterHTML.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,21 @@
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>

+import contextlib
+import io
 import os
 import sys
-import io
-import contextlib

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtGui import QFontInfo
 from PyQt6.QtWidgets import QInputDialog
-from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences, Utilities
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ExporterBase import ExporterBase

-from eric7 import Preferences, Utilities
-

 class HTMLGenerator:
     """
@@ -564,8 +563,7 @@
             )
             return ""

-        from eric7.UI.Previewers import PreviewerHTMLStyles
-        from eric7.UI.Previewers import MarkdownExtensions
+        from eric7.UI.Previewers import MarkdownExtensions, PreviewerHTMLStyles

         extensions = []
--- a/src/eric7/QScintilla/Exporters/ExporterODT.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterODT.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,13 @@

 from PyQt6.QtGui import QTextDocument, QTextDocumentWriter

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ExporterBase import ExporterBase
 from .ExporterHTML import HTMLGenerator

-from eric7 import Preferences
-

 class ExporterODT(ExporterBase):
     """
--- a/src/eric7/QScintilla/Exporters/ExporterPDF.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterPDF.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,16 +10,15 @@
 # This code is a port of the C++ code found in SciTE 1.74
 # Original code: Copyright 1998-2006 by Neil Hodgson <neilh@scintilla.org>

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtGui import QFontInfo
-from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ExporterBase import ExporterBase

-from eric7 import Preferences
-
 PDF_FONT_DEFAULT = 1  # Helvetica
 PDF_FONTSIZE_DEFAULT = 10
 PDF_SPACING_DEFAULT = 1.2
--- a/src/eric7/QScintilla/Exporters/ExporterRTF.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterRTF.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,16 +12,15 @@

 import time

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtGui import QFontInfo
-from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ExporterBase import ExporterBase

-from eric7 import Preferences
-

 class ExporterRTF(ExporterBase):
     """
--- a/src/eric7/QScintilla/Exporters/ExporterTEX.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Exporters/ExporterTEX.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,13 +14,12 @@

 from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .ExporterBase import ExporterBase

-from eric7 import Preferences
-

 class ExporterTEX(ExporterBase):
     """
--- a/src/eric7/QScintilla/KeySequenceTranslator.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/KeySequenceTranslator.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 QKeySequence standard keys.
 """

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtGui import QKeySequence
-from PyQt6.Qsci import QsciScintilla

 __all__ = ["s2qTranslate"]
--- a/src/eric7/QScintilla/Lexers/LexerBash.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerBash.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerBash

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerBash(Lexer, QsciLexerBash):
--- a/src/eric7/QScintilla/Lexers/LexerCMake.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerCMake.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerCMake

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerCMake(Lexer, QsciLexerCMake):
--- a/src/eric7/QScintilla/Lexers/LexerCPP.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerCPP.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerCPP, QsciScintilla

+from eric7 import Preferences
+
 from .SubstyledLexer import SubstyledLexer
-from eric7 import Preferences


 class LexerCPP(SubstyledLexer, QsciLexerCPP):
--- a/src/eric7/QScintilla/Lexers/LexerCSS.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerCSS.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerCSS

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerCSS(Lexer, QsciLexerCSS):
--- a/src/eric7/QScintilla/Lexers/LexerCSharp.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerCSharp.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerCSharp, QsciScintilla

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerCSharp(Lexer, QsciLexerCSharp):
--- a/src/eric7/QScintilla/Lexers/LexerCoffeeScript.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerCoffeeScript.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerCoffeeScript

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerCoffeeScript(Lexer, QsciLexerCoffeeScript):
--- a/src/eric7/QScintilla/Lexers/LexerD.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerD.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerD, QsciScintilla

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerD(Lexer, QsciLexerD):
--- a/src/eric7/QScintilla/Lexers/LexerFortran.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerFortran.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerFortran

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerFortran(Lexer, QsciLexerFortran):
--- a/src/eric7/QScintilla/Lexers/LexerFortran77.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerFortran77.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerFortran77

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerFortran77(Lexer, QsciLexerFortran77):
--- a/src/eric7/QScintilla/Lexers/LexerHTML.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerHTML.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerHTML

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerHTML(Lexer, QsciLexerHTML):
--- a/src/eric7/QScintilla/Lexers/LexerIDL.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerIDL.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerIDL, QsciScintilla

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerIDL(Lexer, QsciLexerIDL):
--- a/src/eric7/QScintilla/Lexers/LexerJSON.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerJSON.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerJSON

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerJSON(Lexer, QsciLexerJSON):
--- a/src/eric7/QScintilla/Lexers/LexerJava.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerJava.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerJava, QsciScintilla

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerJava(Lexer, QsciLexerJava):
--- a/src/eric7/QScintilla/Lexers/LexerJavaScript.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerJavaScript.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerJavaScript, QsciScintilla

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerJavaScript(Lexer, QsciLexerJavaScript):
--- a/src/eric7/QScintilla/Lexers/LexerLua.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerLua.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerLua

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerLua(Lexer, QsciLexerLua):
--- a/src/eric7/QScintilla/Lexers/LexerPO.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPO.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerPO

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerPO(Lexer, QsciLexerPO):
--- a/src/eric7/QScintilla/Lexers/LexerPOV.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPOV.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerPOV

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerPOV(Lexer, QsciLexerPOV):
--- a/src/eric7/QScintilla/Lexers/LexerPascal.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPascal.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerPascal

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerPascal(Lexer, QsciLexerPascal):
--- a/src/eric7/QScintilla/Lexers/LexerPerl.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPerl.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerPerl

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerPerl(Lexer, QsciLexerPerl):
--- a/src/eric7/QScintilla/Lexers/LexerPostScript.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPostScript.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerPostScript

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerPostScript(Lexer, QsciLexerPostScript):
--- a/src/eric7/QScintilla/Lexers/LexerProperties.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerProperties.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerProperties

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerProperties(Lexer, QsciLexerProperties):
--- a/src/eric7/QScintilla/Lexers/LexerPygments.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPygments.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,16 +9,14 @@

 import contextlib

+from pygments.lexers import find_lexer_class, guess_lexer, guess_lexer_for_filename
 from pygments.token import Token
-from pygments.lexers import guess_lexer_for_filename, guess_lexer, find_lexer_class
 from pygments.util import ClassNotFound
-
 from PyQt6.QtGui import QColor, QFont

+from eric7 import Utilities
 from eric7.QScintilla.Lexers.LexerContainer import LexerContainer

-from eric7 import Utilities
-
 PYGMENTS_DEFAULT = 0
 PYGMENTS_COMMENT = 1
 PYGMENTS_PREPROCESSOR = 2
--- a/src/eric7/QScintilla/Lexers/LexerPython.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerPython.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,14 @@
 Module implementing a Python lexer with some additional methods.
 """

+import contextlib
 import re
-import contextlib

 from PyQt6.Qsci import QsciLexerPython, QsciScintilla

+from eric7 import Preferences
+
 from .SubstyledLexer import SubstyledLexer
-from eric7 import Preferences


 class LexerPython(SubstyledLexer, QsciLexerPython):
--- a/src/eric7/QScintilla/Lexers/LexerQSS.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerQSS.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerCSS

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerQSS(Lexer, QsciLexerCSS):
--- a/src/eric7/QScintilla/Lexers/LexerRuby.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerRuby.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerRuby

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerRuby(Lexer, QsciLexerRuby):
--- a/src/eric7/QScintilla/Lexers/LexerSQL.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerSQL.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerSQL

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerSQL(Lexer, QsciLexerSQL):
--- a/src/eric7/QScintilla/Lexers/LexerTCL.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerTCL.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.Qsci import QsciLexerTCL

-from .Lexer import Lexer
+from eric7 import Preferences

-from eric7 import Preferences
+from .Lexer import Lexer


 class LexerTCL(Lexer, QsciLexerTCL):
--- a/src/eric7/QScintilla/Lexers/LexerTeX.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerTeX.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerTeX

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerTeX(Lexer, QsciLexerTeX):
--- a/src/eric7/QScintilla/Lexers/LexerVHDL.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerVHDL.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerVHDL

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerVHDL(Lexer, QsciLexerVHDL):
--- a/src/eric7/QScintilla/Lexers/LexerXML.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerXML.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,9 @@

 from PyQt6.Qsci import QsciLexerXML

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerXML(Lexer, QsciLexerXML):
--- a/src/eric7/QScintilla/Lexers/LexerYAML.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/LexerYAML.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,9 @@

 from PyQt6.Qsci import QsciLexerYAML

+from eric7 import Preferences
+
 from .Lexer import Lexer
-from eric7 import Preferences


 class LexerYAML(Lexer, QsciLexerYAML):
--- a/src/eric7/QScintilla/Lexers/SubstyledLexer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Lexers/SubstyledLexer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.QtGui import QColor

-from .Lexer import Lexer
+from eric7 import Preferences

-from eric7 import Preferences
+from .Lexer import Lexer


 class SubstyledLexer(Lexer):
--- a/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/MarkupProviders/ImageMarkupDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, QSize
+from PyQt6.QtCore import QSize, pyqtSlot
 from PyQt6.QtGui import QImage, QImageReader
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
--- a/src/eric7/QScintilla/MiniEditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/MiniEditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,54 +7,51 @@
 Module implementing an editor for simple editing tasks.
 """

+import contextlib
 import os
 import pathlib
 import re
-import contextlib

 import editorconfig

+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import (
+    QCoreApplication,
+    QPoint,
+    QSignalMapper,
+    QSize,
+    Qt,
+    QTimer,
     pyqtSignal,
     pyqtSlot,
-    Qt,
-    QSignalMapper,
-    QPoint,
-    QTimer,
-    QSize,
-    QCoreApplication,
 )
-from PyQt6.QtGui import QKeySequence, QPalette, QFont, QPixmap, QActionGroup, QAction
+from PyQt6.QtGui import QAction, QActionGroup, QFont, QKeySequence, QPalette, QPixmap
+from PyQt6.QtPrintSupport import QAbstractPrintDialog, QPrintDialog, QPrinter
 from PyQt6.QtWidgets import (
-    QWidget,
-    QWhatsThis,
+    QApplication,
     QDialog,
+    QHBoxLayout,
     QInputDialog,
-    QApplication,
+    QLabel,
     QMenu,
     QVBoxLayout,
-    QHBoxLayout,
-    QLabel,
+    QWhatsThis,
+    QWidget,
 )
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
-from PyQt6.Qsci import QsciScintilla
-
+
+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.Globals import isMacPlatform
+from eric7.UI import Config

 from .QsciScintillaCompat import QsciScintillaCompat

-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config
-
-from eric7.Globals import isMacPlatform
-
-from eric7 import Preferences, Utilities
-

 class MiniScintilla(QsciScintillaCompat):
     """
@@ -3682,6 +3679,7 @@
         Private slot to show a print preview of the text.
         """
         from PyQt6.QtPrintSupport import QPrintPreviewDialog
+
         from .Printer import Printer

         printer = Printer(mode=QPrinter.PrinterMode.HighResolution)
--- a/src/eric7/QScintilla/Printer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Printer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing the printer functionality.
 """

-from PyQt6.QtCore import QTime, QDate, Qt, QCoreApplication, QMarginsF
+from PyQt6.Qsci import QsciPrinter
+from PyQt6.QtCore import QCoreApplication, QDate, QMarginsF, Qt, QTime
 from PyQt6.QtGui import QColor, QPageLayout
 from PyQt6.QtPrintSupport import QPrinter
-from PyQt6.Qsci import QsciPrinter

 from eric7 import Preferences
--- a/src/eric7/QScintilla/QsciScintillaCompat.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/QsciScintillaCompat.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,11 @@

 import contextlib

-from PyQt6.QtCore import pyqtSignal, Qt, QPoint
-from PyQt6.QtGui import QPalette, QColor
+from PyQt6.Qsci import QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION
+from PyQt6.Qsci import QsciScintilla, QsciScintillaBase
+from PyQt6.QtCore import QPoint, Qt, pyqtSignal
+from PyQt6.QtGui import QColor, QPalette
 from PyQt6.QtWidgets import QApplication, QListWidget
-from PyQt6.Qsci import (
-    QsciScintillaBase,
-    QsciScintilla,
-    QSCINTILLA_VERSION as QSCIQSCINTILLA_VERSION,
-)

 ###############################################################################
--- a/src/eric7/QScintilla/SearchReplaceWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/SearchReplaceWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,27 +7,25 @@
 Module implementing the search and replace widget.
 """

+import contextlib
 import re
-import contextlib

-from PyQt6.QtCore import pyqtSignal, Qt, pyqtSlot, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
+    QFrame,
     QHBoxLayout,
-    QToolButton,
     QScrollArea,
     QSizePolicy,
-    QFrame,
+    QToolButton,
+    QWidget,
 )

-from .Editor import Editor
-
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Preferences
-
-from eric7.EricGui import EricPixmapCache
+from .Editor import Editor


 class SearchReplaceWidget(QWidget):
--- a/src/eric7/QScintilla/Shell.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/Shell.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,37 +7,34 @@
 Module implementing a graphical Python shell.
 """

-import sys
-import re
 import contextlib
 import enum
 import pathlib
+import re
+import sys

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent
-from PyQt6.QtGui import QClipboard, QPalette, QFont, QShortcut
+from PyQt6.Qsci import QsciScintilla
+from PyQt6.QtCore import QEvent, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QClipboard, QFont, QPalette, QShortcut
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
+    QHBoxLayout,
     QInputDialog,
-    QApplication,
     QMenu,
+    QSizePolicy,
+    QVBoxLayout,
     QWidget,
-    QHBoxLayout,
-    QVBoxLayout,
-    QSizePolicy,
 )
-from PyQt6.Qsci import QsciScintilla

+from eric7 import Preferences, Utilities
+from eric7.Debugger.DebugClientCapabilities import HasCompleter
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog

 from .QsciScintillaCompat import QsciScintillaCompat

-from eric7 import Preferences, Utilities
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Debugger.DebugClientCapabilities import HasCompleter
-

 class ShellAssembly(QWidget):
     """
--- a/src/eric7/QScintilla/ShellHistoryDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/ShellHistoryDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QItemSelectionModel
-from PyQt6.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtCore import QItemSelectionModel, Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from .Ui_ShellHistoryDialog import Ui_ShellHistoryDialog
--- a/src/eric7/QScintilla/ShellWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/ShellWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,31 +9,26 @@

 import os

-from PyQt6.QtCore import Qt, QCoreApplication, QPoint, QSize, QSignalMapper, QProcess
-from PyQt6.QtGui import QKeySequence, QAction
-from PyQt6.QtWidgets import QWidget, QVBoxLayout, QApplication, QWhatsThis, QDialog
 from PyQt6.Qsci import QsciScintilla
-
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricGui.EricAction import EricAction, createActionGroup
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtCore import QCoreApplication, QPoint, QProcess, QSignalMapper, QSize, Qt
+from PyQt6.QtGui import QAction, QKeySequence
+from PyQt6.QtWidgets import QApplication, QDialog, QVBoxLayout, QWhatsThis, QWidget

+from eric7 import Preferences
+from eric7.Debugger.DebugServer import DebugServer
 from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.Globals import getConfig, getPythonExecutable, isMacPlatform
 from eric7.UI import Config
-from eric7 import Preferences
-
-from eric7.Globals import isMacPlatform, getPythonExecutable
-
-from .Shell import Shell
-from .APIsManager import APIsManager
-
-from eric7.Debugger.DebugServer import DebugServer
 from eric7.UI.SearchWidget import SearchWidget
 from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager

-from eric7.Globals import getConfig
+from .APIsManager import APIsManager
+from .Shell import Shell


 class ShellWindow(EricMainWindow):
--- a/src/eric7/QScintilla/SpellChecker.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/SpellChecker.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,10 @@
 The spell checker is based on pyenchant.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import QTimer, QObject
+from PyQt6.QtCore import QObject, QTimer

 from eric7 import Preferences, Utilities
--- a/src/eric7/QScintilla/SpellCheckingDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/SpellCheckingDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_SpellCheckingDialog import Ui_SpellCheckingDialog
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_SpellCheckingDialog import Ui_SpellCheckingDialog


 class SpellCheckingDialog(QDialog, Ui_SpellCheckingDialog):
--- a/src/eric7/QScintilla/SpellingDictionaryEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/SpellingDictionaryEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
+from PyQt6.QtCore import QSortFilterProxyModel, QStringListModel, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog

 from .Ui_SpellingDictionaryEditDialog import Ui_SpellingDictionaryEditDialog
--- a/src/eric7/QScintilla/TypingCompleters/CompleterPython.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/TypingCompleters/CompleterPython.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,11 +11,11 @@

 from PyQt6.Qsci import QsciLexerPython, QsciScintilla

-from .CompleterBase import CompleterBase
-
 from eric7 import Preferences
 from eric7.Utilities import rxIndex

+from .CompleterBase import CompleterBase
+

 class CompleterPython(CompleterBase):
     """
--- a/src/eric7/QScintilla/TypingCompleters/CompleterRuby.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/TypingCompleters/CompleterRuby.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.Qsci import QsciLexerRuby, QsciScintilla

-from .CompleterBase import CompleterBase
+from eric7 import Preferences

-from eric7 import Preferences
+from .CompleterBase import CompleterBase


 class CompleterRuby(CompleterBase):
--- a/src/eric7/QScintilla/TypingCompleters/CompleterYaml.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/QScintilla/TypingCompleters/CompleterYaml.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.Qsci import QsciScintilla

-from .CompleterBase import CompleterBase
+from eric7 import Preferences

-from eric7 import Preferences
+from .CompleterBase import CompleterBase


 class CompleterYaml(CompleterBase):
--- a/src/eric7/Sessions/SessionFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Sessions/SessionFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,12 @@
 import json
 import time

-from PyQt6.QtCore import Qt, QObject
-
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtCore import QObject, Qt

 from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp


 class SessionFile(QObject):
--- a/src/eric7/Snapshot/SnapWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,32 +11,30 @@
 # SnapWidget and its associated modules are PyQt6 ports of Ksnapshot.
 #

+import contextlib
 import os
 import pathlib
 import re
-import contextlib

 from PyQt6.QtCore import (
-    pyqtSlot,
+    QLocale,
+    QMimeData,
+    QPoint,
+    QStandardPaths,
     Qt,
     QTimer,
-    QPoint,
-    QMimeData,
-    QLocale,
-    QStandardPaths,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QImageWriter, QPixmap, QDrag, QKeySequence, QShortcut
-from PyQt6.QtWidgets import QWidget, QApplication
+from PyQt6.QtGui import QDrag, QImageWriter, QKeySequence, QPixmap, QShortcut
+from PyQt6.QtWidgets import QApplication, QWidget

+from eric7 import Globals, Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox

+from .SnapshotModes import SnapshotModes
 from .Ui_SnapWidget import Ui_SnapWidget

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences
-
-from .SnapshotModes import SnapshotModes
-

 class SnapWidget(QWidget, Ui_SnapWidget):
     """
--- a/src/eric7/Snapshot/SnapshotDefaultGrabber.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotDefaultGrabber.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing a grabber object for non-Wayland desktops.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QObject, QTimer, QEvent
-from PyQt6.QtGui import QPixmap, QCursor, QGuiApplication
+from PyQt6.QtCore import QEvent, QObject, Qt, QTimer, pyqtSignal
+from PyQt6.QtGui import QCursor, QGuiApplication, QPixmap
 from PyQt6.QtWidgets import QWidget

-from .SnapshotModes import SnapshotModes
+from eric7 import Globals

-from eric7 import Globals
+from .SnapshotModes import SnapshotModes


 class SnapshotDefaultGrabber(QObject):
--- a/src/eric7/Snapshot/SnapshotFreehandGrabber.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotFreehandGrabber.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,21 +7,21 @@
 Module implementing a grabber widget for a freehand snapshot region.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
+from PyQt6.QtCore import QLocale, QPoint, QRect, Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import (
-    QPixmap,
+    QBrush,
     QColor,
-    QRegion,
+    QCursor,
+    QGuiApplication,
+    QPaintEngine,
     QPainter,
     QPalette,
+    QPen,
+    QPixmap,
     QPolygon,
-    QPen,
-    QBrush,
-    QPaintEngine,
-    QGuiApplication,
-    QCursor,
+    QRegion,
 )
-from PyQt6.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QToolTip, QWidget

 from eric7 import Globals
--- a/src/eric7/Snapshot/SnapshotPreview.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotPreview.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the snapshot preview label.
 """

-from PyQt6.QtCore import pyqtSignal, QPoint, Qt
-from PyQt6.QtWidgets import QLabel, QApplication
+from PyQt6.QtCore import QPoint, Qt, pyqtSignal
+from PyQt6.QtWidgets import QApplication, QLabel


 class SnapshotPreview(QLabel):
--- a/src/eric7/Snapshot/SnapshotRegionGrabber.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotRegionGrabber.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,20 @@
 Module implementing a grabber widget for a rectangular snapshot region.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QRect, QPoint, QTimer, QLocale
+from PyQt6.QtCore import QLocale, QPoint, QRect, Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import (
-    QPixmap,
+    QBrush,
     QColor,
-    QRegion,
+    QCursor,
+    QGuiApplication,
+    QPaintEngine,
     QPainter,
     QPalette,
-    QPaintEngine,
     QPen,
-    QBrush,
-    QGuiApplication,
-    QCursor,
+    QPixmap,
+    QRegion,
 )
-from PyQt6.QtWidgets import QWidget, QToolTip
+from PyQt6.QtWidgets import QToolTip, QWidget

 from eric7 import Globals
--- a/src/eric7/Snapshot/SnapshotTimer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotTimer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the snapshot timer widget.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QTimer, QRect
+from PyQt6.QtCore import QRect, Qt, QTimer, pyqtSignal
 from PyQt6.QtGui import QPainter, QPalette
-from PyQt6.QtWidgets import QWidget, QApplication, QToolTip
+from PyQt6.QtWidgets import QApplication, QToolTip, QWidget


 class SnapshotTimer(QWidget):
--- a/src/eric7/Snapshot/SnapshotWaylandGrabber.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Snapshot/SnapshotWaylandGrabber.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a grabber object for non-Wayland desktops.
 """

+import contextlib
 import os
 import uuid
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject, QTimer
-from PyQt6.QtGui import QPixmap, QCursor
+from PyQt6.QtCore import QObject, QTimer, pyqtSignal
+from PyQt6.QtGui import QCursor, QPixmap
 from PyQt6.QtWidgets import QApplication

 try:
@@ -22,12 +22,11 @@
 except ImportError:
     DBusAvailable = False

+from eric7 import Globals
 from eric7.EricWidgets import EricMessageBox

 from .SnapshotModes import SnapshotModes

-from eric7 import Globals
-

 class SnapshotWaylandGrabber(QObject):
     """
--- a/src/eric7/SqlBrowser/SqlBrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/SqlBrowser/SqlBrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,16 @@

 from PyQt6.QtCore import QTimer, QUrl
 from PyQt6.QtGui import QKeySequence
-from PyQt6.QtSql import QSqlError, QSqlDatabase
+from PyQt6.QtSql import QSqlDatabase, QSqlError

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config

-from eric7 import Preferences
-

 class SqlBrowser(EricMainWindow):
     """
--- a/src/eric7/SqlBrowser/SqlBrowserWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/SqlBrowser/SqlBrowserWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,16 @@
 Module implementing the SQL Browser widget.
 """

-from PyQt6.QtCore import pyqtSignal, QVariant, Qt, pyqtSlot
+from PyQt6.QtCore import Qt, QVariant, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QStandardItemModel
-from PyQt6.QtWidgets import QWidget, QDialog, QAbstractItemView
 from PyQt6.QtSql import (
     QSqlDatabase,
     QSqlError,
-    QSqlTableModel,
+    QSqlQuery,
     QSqlQueryModel,
-    QSqlQuery,
+    QSqlTableModel,
 )
+from PyQt6.QtWidgets import QAbstractItemView, QDialog, QWidget

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/SqlBrowser/SqlConnectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/SqlBrowser/SqlConnectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 """

 from PyQt6.QtCore import pyqtSlot
+from PyQt6.QtSql import QSqlDatabase
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
-from PyQt6.QtSql import QSqlDatabase

 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
--- a/src/eric7/SqlBrowser/SqlConnectionWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/SqlBrowser/SqlConnectionWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,16 @@
 Module implementing a widget showing the SQL connections.
 """

-from PyQt6.QtCore import pyqtSignal, Qt
+from PyQt6.QtCore import Qt, pyqtSignal
 from PyQt6.QtGui import QAction
+from PyQt6.QtSql import QSqlDatabase
 from PyQt6.QtWidgets import (
-    QWidget,
     QHeaderView,
     QTreeWidget,
+    QTreeWidgetItem,
     QVBoxLayout,
-    QTreeWidgetItem,
+    QWidget,
 )
-from PyQt6.QtSql import QSqlDatabase


 class SqlConnectionWidget(QWidget):
--- a/src/eric7/Tasks/Task.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tasks/Task.py	Fri Nov 04 13:52:26 2022 +0100
@@ -15,8 +15,8 @@
 from PyQt6.QtCore import Qt, QUuid
 from PyQt6.QtWidgets import QTreeWidgetItem

+from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences


 class TaskType(enum.IntEnum):
--- a/src/eric7/Tasks/TaskFilterConfigDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tasks/TaskFilterConfigDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,7 @@

 from PyQt6.QtWidgets import QDialog

-from .Task import TaskType, TaskPriority
-
+from .Task import TaskPriority, TaskType
 from .Ui_TaskFilterConfigDialog import Ui_TaskFilterConfigDialog
--- a/src/eric7/Tasks/TaskPropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tasks/TaskPropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,9 @@

 from eric7.EricWidgets.EricCompleters import EricFileCompleter

+from .Task import TaskPriority, TaskType
 from .Ui_TaskPropertiesDialog import Ui_TaskPropertiesDialog

-from .Task import TaskType, TaskPriority
-

 class TaskPropertiesDialog(QDialog, Ui_TaskPropertiesDialog):
     """
--- a/src/eric7/Tasks/TaskViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tasks/TaskViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,35 +11,32 @@
 introductory text. This text is configurable.
 """

+import fnmatch
 import os
-import fnmatch
 import threading
 import time

-from PyQt6.QtCore import pyqtSignal, Qt, QThread
+from PyQt6.QtCore import Qt, QThread, pyqtSignal
 from PyQt6.QtWidgets import (
+    QAbstractItemView,
+    QApplication,
+    QDialog,
     QHeaderView,
+    QInputDialog,
     QLineEdit,
+    QMenu,
     QTreeWidget,
-    QDialog,
-    QInputDialog,
-    QApplication,
-    QMenu,
-    QAbstractItemView,
     QTreeWidgetItem,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
-
-from .Task import Task, TaskType, TaskPriority
+from eric7.Utilities.AutoSaver import AutoSaver

-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Preferences, Utilities
-
-from eric7.Utilities.AutoSaver import AutoSaver
+from .Task import Task, TaskPriority, TaskType


 class TaskViewer(QTreeWidget):
--- a/src/eric7/Tasks/TasksFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tasks/TasksFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,13 +12,12 @@

 from PyQt6.QtCore import QObject

+from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-
-from .Task import TaskType, TaskPriority
+from .Task import TaskPriority, TaskType


 class TasksFile(QObject):
--- a/src/eric7/Templates/TemplateMultipleVariablesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Templates/TemplateMultipleVariablesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,19 +9,19 @@

 from PyQt6.QtCore import QSize, Qt
 from PyQt6.QtWidgets import (
-    QSizePolicy,
-    QSpacerItem,
-    QWidget,
+    QDialog,
+    QFrame,
+    QGridLayout,
     QHBoxLayout,
+    QLabel,
     QLineEdit,
     QPushButton,
+    QScrollArea,
+    QSizePolicy,
+    QSpacerItem,
     QTextEdit,
-    QDialog,
-    QScrollArea,
-    QFrame,
-    QGridLayout,
     QVBoxLayout,
-    QLabel,
+    QWidget,
 )
--- a/src/eric7/Templates/TemplatePropertiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Templates/TemplatePropertiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing the templates properties dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QRegularExpression
+from PyQt6.QtCore import QRegularExpression, Qt, pyqtSlot
 from PyQt6.QtGui import QRegularExpressionValidator
 from PyQt6.QtWidgets import QDialog

-from .Ui_TemplatePropertiesDialog import Ui_TemplatePropertiesDialog
-
+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Preferences
+from .Ui_TemplatePropertiesDialog import Ui_TemplatePropertiesDialog


 class TemplatePropertiesDialog(QDialog, Ui_TemplatePropertiesDialog):
--- a/src/eric7/Templates/TemplateViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Templates/TemplateViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,13 @@
 import pathlib
 import re

-from PyQt6.QtCore import QFile, QIODevice, Qt, QCoreApplication
-from PyQt6.QtWidgets import QTreeWidget, QDialog, QApplication, QMenu, QTreeWidgetItem
+from PyQt6.QtCore import QCoreApplication, QFile, QIODevice, Qt
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QTreeWidget, QTreeWidgetItem

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities

 from .TemplatesFile import TemplatesFile
--- a/src/eric7/Templates/TemplatesFile.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Templates/TemplatesFile.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,9 +13,8 @@

 from PyQt6.QtCore import QObject

+from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverridenCursor
-

 TemplateViewer = typing.TypeVar("TemplateViewer")
--- a/src/eric7/Testing/Interfaces/PytestExecutor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/Interfaces/PytestExecutor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,7 @@
 import json
 import os

-from PyQt6.QtCore import pyqtSlot, QProcess
+from PyQt6.QtCore import QProcess, pyqtSlot

 from eric7.EricNetwork.EricJsonStreamReader import EricJsonReader
--- a/src/eric7/Testing/Interfaces/PytestRunner.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/Interfaces/PytestRunner.py	Fri Nov 04 13:52:26 2022 +0100
@@ -356,6 +356,7 @@

     elif command == "runtest":
         import pytest
+
         from eric7.EricNetwork.EricJsonStreamWriter import EricJsonWriter

         writer = EricJsonWriter(sys.argv[2], int(sys.argv[3]))
--- a/src/eric7/Testing/Interfaces/TestExecutorBase.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/Interfaces/TestExecutorBase.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,11 @@
 """

 import os
+
 from dataclasses import dataclass
 from enum import IntEnum

-from PyQt6.QtCore import pyqtSignal, QObject, QProcess, QProcessEnvironment
+from PyQt6.QtCore import QObject, QProcess, QProcessEnvironment, pyqtSignal

 from eric7 import Preferences
--- a/src/eric7/Testing/Interfaces/UnittestExecutor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/Interfaces/UnittestExecutor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,7 +12,7 @@
 import os
 import re

-from PyQt6.QtCore import pyqtSlot, QProcess
+from PyQt6.QtCore import QProcess, pyqtSlot

 from eric7.EricNetwork.EricJsonStreamReader import EricJsonReader
--- a/src/eric7/Testing/MarkersWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/MarkersWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import Qt
-from PyQt6.QtWidgets import QWidget, QTreeWidgetItem
+from PyQt6.QtWidgets import QTreeWidgetItem, QWidget

 from .Ui_MarkersWindow import Ui_MarkersWindow
--- a/src/eric7/Testing/TestResultsTree.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/TestResultsTree.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,21 +16,20 @@
 from operator import attrgetter

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
-    Qt,
     QAbstractItemModel,
     QCoreApplication,
     QModelIndex,
     QPoint,
+    Qt,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QBrush, QColor
 from PyQt6.QtWidgets import QMenu, QTreeView

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-
 from .Interfaces.TestExecutorBase import TestResultCategory

 TopLevelId = 2**32 - 1
--- a/src/eric7/Testing/TestingWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Testing/TestingWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,31 +12,28 @@
 import locale
 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QEvent, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QEvent, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QAbstractButton, QComboBox, QDialogButtonBox, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import (
+    recentNameTestDiscoverHistory,
+    recentNameTestEnvironment,
+    recentNameTestFileHistory,
+    recentNameTestFramework,
+    recentNameTestNameHistory,
+)

-from .Ui_TestingWidget import Ui_TestingWidget
-
-from .TestResultsTree import TestResultsModel, TestResultsTreeView
 from .Interfaces import Frameworks
 from .Interfaces.TestExecutorBase import TestConfig, TestResult, TestResultCategory
 from .Interfaces.TestFrameworkRegistry import TestFrameworkRegistry
-
-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Globals import (
-    recentNameTestDiscoverHistory,
-    recentNameTestFileHistory,
-    recentNameTestNameHistory,
-    recentNameTestFramework,
-    recentNameTestEnvironment,
-)
+from .TestResultsTree import TestResultsModel, TestResultsTreeView
+from .Ui_TestingWidget import Ui_TestingWidget


 class TestingWidgetModes(enum.Enum):
--- a/src/eric7/Toolbox/SingleApplication.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Toolbox/SingleApplication.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,9 @@
 from PyQt6.QtCore import QByteArray
 from PyQt6.QtNetwork import QLocalServer, QLocalSocket

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Utilities
-

 class SingleApplicationServer(QLocalServer):
     """
--- a/src/eric7/Toolbox/Startup.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Toolbox/Startup.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,15 +10,12 @@
 import os
 import sys

-from PyQt6.QtCore import QTranslator, QLocale, QLibraryInfo, QDir
+from PyQt6.QtCore import QDir, QLibraryInfo, QLocale, QTranslator
 from PyQt6.QtWidgets import QApplication

+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import EricApplication
-
-from eric7 import Globals
-
-from eric7.EricGui import EricPixmapCache
-
 from eric7.Globals import getConfig

 application = None
--- a/src/eric7/Tools/TRPreviewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tools/TRPreviewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,46 +7,42 @@
 Module implementing the TR Previewer main window.
 """

+import contextlib
 import os
 import pathlib
-import contextlib

+from PyQt6 import uic
 from PyQt6.QtCore import (
+    QCoreApplication,
     QDir,
-    QTimer,
-    pyqtSignal,
     QEvent,
+    QObject,
     QSize,
+    Qt,
+    QTimer,
     QTranslator,
-    QObject,
-    Qt,
-    QCoreApplication,
+    pyqtSignal,
 )
-from PyQt6.QtGui import QKeySequence, QAction
+from PyQt6.QtGui import QAction, QKeySequence
 from PyQt6.QtWidgets import (
+    QApplication,
+    QComboBox,
+    QHBoxLayout,
+    QLabel,
+    QMdiArea,
     QSizePolicy,
     QSpacerItem,
-    QWidget,
-    QHBoxLayout,
+    QVBoxLayout,
     QWhatsThis,
-    QMdiArea,
-    QApplication,
-    QComboBox,
-    QVBoxLayout,
-    QLabel,
+    QWidget,
 )
-from PyQt6 import uic
-
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricGui import EricPixmapCache
-from eric7.UI import Config

 from eric7 import Preferences
-
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.UI import Config

 noTranslationName = QCoreApplication.translate("TRPreviewer", "<No translation>")
--- a/src/eric7/Tools/TrayStarter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tools/TrayStarter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,21 +7,20 @@
 Module implementing a starter for the system tray.
 """

-import sys
+import contextlib
 import os
 import pathlib
-import contextlib
+import sys

 from PyQt6.QtCore import QProcess, QSettings
 from PyQt6.QtGui import QCursor
-from PyQt6.QtWidgets import QSystemTrayIcon, QMenu, QDialog, QApplication
-
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricWidgets.EricApplication import ericApp
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon

 from eric7 import Globals, Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
-from eric7.UI.Info import Version, Program
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.UI.Info import Program, Version


 class TrayStarter(QSystemTrayIcon):
@@ -574,8 +573,8 @@
         """
         Private slot to handle the Versions dialog.
         """
-        from PyQt6.QtCore import qVersion, PYQT_VERSION_STR
         from PyQt6.Qsci import QSCINTILLA_VERSION_STR
+        from PyQt6.QtCore import PYQT_VERSION_STR, qVersion

         try:
             try:
--- a/src/eric7/Tools/UIPreviewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tools/UIPreviewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,35 +10,33 @@
 import contextlib
 import pathlib

+from PyQt6 import uic
 from PyQt6.QtCore import QDir, QEvent, QSize, Qt
-from PyQt6.QtGui import QAction, QKeySequence, QImageWriter, QPainter
+from PyQt6.QtGui import QAction, QImageWriter, QKeySequence, QPainter
+from PyQt6.QtPrintSupport import QPrintDialog, QPrinter
 from PyQt6.QtWidgets import (
+    QApplication,
+    QComboBox,
+    QDialog,
+    QFrame,
+    QHBoxLayout,
+    QLabel,
+    QMainWindow,
+    QScrollArea,
     QSizePolicy,
     QSpacerItem,
-    QWidget,
-    QHBoxLayout,
-    QWhatsThis,
-    QDialog,
-    QScrollArea,
-    QApplication,
     QStyleFactory,
-    QFrame,
-    QMainWindow,
-    QComboBox,
     QVBoxLayout,
-    QLabel,
+    QWhatsThis,
+    QWidget,
 )
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog
-from PyQt6 import uic
-
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.UI import Config
--- a/src/eric7/Tools/webBrowserSupport.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Tools/webBrowserSupport.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 it is absent.
 """

+import contextlib
 import sys
-import contextlib

 variant = "None"
--- a/src/eric7/UI/Browser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/Browser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,49 +11,48 @@
 import shutil

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
+    QCoreApplication,
+    QElapsedTimer,
+    QItemSelectionModel,
+    QModelIndex,
     Qt,
     QUrl,
-    QCoreApplication,
-    QItemSelectionModel,
-    QModelIndex,
-    QElapsedTimer,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QAction, QDesktopServices
 from PyQt6.QtWidgets import (
-    QTreeView,
+    QAbstractItemView,
     QApplication,
-    QMenu,
-    QAbstractItemView,
+    QDialog,
     QInputDialog,
     QLineEdit,
-    QDialog,
+    QMenu,
+    QTreeView,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.Project.ProjectBrowserModel import ProjectBrowserSimpleDirectoryItem
+from eric7.Utilities import MimeTypes

-from eric7.Project.ProjectBrowserModel import ProjectBrowserSimpleDirectoryItem
 from .BrowserModel import (
-    BrowserModel,
+    BrowserClassAttributeItem,
+    BrowserClassItem,
     BrowserDirectoryItem,
     BrowserFileItem,
-    BrowserClassItem,
-    BrowserMethodItem,
-    BrowserClassAttributeItem,
+    BrowserGlobalsItem,
     BrowserImportItem,
     BrowserImportsItem,
+    BrowserItemDirectory,
+    BrowserMethodItem,
+    BrowserModel,
     BrowserSysPathItem,
-    BrowserGlobalsItem,
-    BrowserItemDirectory,
 )
 from .BrowserSortFilterProxyModel import BrowserSortFilterProxyModel

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-from eric7.Utilities import MimeTypes
-

 class Browser(QTreeView):
     """
--- a/src/eric7/UI/BrowserModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/BrowserModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,25 +7,25 @@
 Module implementing the browser model.
 """

-import os
+import contextlib
 import fnmatch
 import json
-import contextlib
+import os

 from PyQt6.QtCore import (
+    QAbstractItemModel,
+    QCoreApplication,
     QDir,
+    QFileSystemWatcher,
     QModelIndex,
-    QAbstractItemModel,
-    QFileSystemWatcher,
+    QProcess,
     Qt,
-    QProcess,
-    QCoreApplication,
 )
-from PyQt6.QtGui import QImageReader, QFont
+from PyQt6.QtGui import QFont, QImageReader
 from PyQt6.QtWidgets import QApplication

+from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities

 BrowserItemRoot = 0
 BrowserItemDirectory = 1
--- a/src/eric7/UI/CodeDocumentationViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/CodeDocumentationViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,27 +8,26 @@
 plug-ins.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QTimer
+from PyQt6.QtCore import Qt, QTimer, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QCursor
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QComboBox,
     QHBoxLayout,
     QLabel,
-    QComboBox,
+    QLineEdit,
     QSizePolicy,
-    QLineEdit,
     QTextBrowser,
     QToolTip,
+    QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricTextEditSearchWidget import (
     EricTextEditSearchWidget,
     EricTextEditType,
 )
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7 import Preferences

 from .CodeDocumentationViewerTemplate import (
     prepareDocumentationViewerHtmlDocument,
--- a/src/eric7/UI/CodeDocumentationViewerTemplate.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/CodeDocumentationViewerTemplate.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,11 +11,9 @@

 from PyQt6.QtCore import QCoreApplication

+from eric7 import Utilities
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Utilities
-
-
 _stylesheetsCache = {
     "dark": "",
     "light": "",
--- a/src/eric7/UI/CompareDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/CompareDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,22 +9,21 @@
 """

 import re
-from difflib import _mdiff, IS_CHARACTER_JUNK
+
+from difflib import IS_CHARACTER_JUNK, _mdiff

-from PyQt6.QtCore import QTimer, QEvent, pyqtSlot
-from PyQt6.QtGui import QFontMetrics, QBrush, QTextCursor
-from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox
+from PyQt6.QtCore import QEvent, QTimer, pyqtSlot
+from PyQt6.QtGui import QBrush, QFontMetrics, QTextCursor
+from PyQt6.QtWidgets import QApplication, QDialogButtonBox, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

-from eric7.EricGui import EricPixmapCache
-
 from .Ui_CompareDialog import Ui_CompareDialog

-from eric7 import Preferences
-

 def sbsdiff(a, b, linenumberwidth=4):
     """
--- a/src/eric7/UI/DiffDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/DiffDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,24 +7,24 @@
 Module implementing a dialog to compare two files.
 """

+import contextlib
 import os
 import pathlib
 import time
-import contextlib
-from difflib import unified_diff, context_diff
+
+from difflib import context_diff, unified_diff

 from PyQt6.QtCore import QEvent, pyqtSlot
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox
+from PyQt6.QtWidgets import QApplication, QDialogButtonBox, QWidget

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from .DiffHighlighter import DiffHighlighter
 from .Ui_DiffDialog import Ui_DiffDialog
-from .DiffHighlighter import DiffHighlighter
-
-from eric7 import Preferences, Utilities


 class DiffDialog(QWidget, Ui_DiffDialog):
--- a/src/eric7/UI/EmailDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/EmailDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,37 +7,35 @@
 Module implementing a dialog to send bug reports or feature requests.
 """

-import os
+import contextlib
 import mimetypes
+import os
 import smtplib
-import contextlib
+
+from email.header import Header
+from email.mime.application import MIMEApplication
+from email.mime.audio import MIMEAudio
+from email.mime.image import MIMEImage
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText

 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QTextOption
 from PyQt6.QtWidgets import (
+    QDialog,
+    QDialogButtonBox,
     QHeaderView,
+    QInputDialog,
     QLineEdit,
-    QDialog,
-    QInputDialog,
-    QDialogButtonBox,
     QTreeWidgetItem,
 )

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Preferences, Utilities
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from .Ui_EmailDialog import Ui_EmailDialog
+from eric7.EricWidgets import EricFileDialog, EricMessageBox

 from .Info import BugAddress, FeatureAddress
-from eric7 import Preferences, Utilities
-
-from email.mime.text import MIMEText
-from email.mime.image import MIMEImage
-from email.mime.audio import MIMEAudio
-from email.mime.application import MIMEApplication
-from email.mime.multipart import MIMEMultipart
-from email.header import Header
-
+from .Ui_EmailDialog import Ui_EmailDialog

 ############################################################
 ## This code is to work around a bug in the Python email  ##
--- a/src/eric7/UI/ErrorLogDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/ErrorLogDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing a dialog to display an error log.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QStyle

 from .Ui_ErrorLogDialog import Ui_ErrorLogDialog
--- a/src/eric7/UI/FindFileWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/FindFileWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,28 +11,27 @@
 import re
 import time

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QUrl
+from PyQt6.QtCore import QPoint, Qt, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QCursor, QDesktopServices, QImageReader
 from PyQt6.QtWidgets import (
-    QWidget,
     QApplication,
-    QMenu,
-    QTreeWidgetItem,
     QComboBox,
     QDialog,
     QDialogButtonBox,
+    QMenu,
+    QTreeWidgetItem,
     QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_FindFileWidget import Ui_FindFileWidget

-from eric7 import Preferences, Utilities
-from eric7.EricGui import EricPixmapCache
-

 class FindFileWidget(QWidget, Ui_FindFileWidget):
     """
--- a/src/eric7/UI/FindLocationWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/FindLocationWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,26 +10,25 @@
 import os
 import sys

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QDesktopServices, QImageReader
 from PyQt6.QtWidgets import (
-    QWidget,
-    QHeaderView,
     QApplication,
-    QTreeWidgetItem,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
+    QTreeWidgetItem,
     QVBoxLayout,
+    QWidget,
 )

+from eric7 import Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Utilities import direntries

 from .Ui_FindLocationWidget import Ui_FindLocationWidget

-from eric7.EricGui import EricPixmapCache
-from eric7.Utilities import direntries
-from eric7 import Utilities
-

 class FindLocationWidget(QWidget, Ui_FindLocationWidget):
     """
--- a/src/eric7/UI/InstallInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/InstallInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,13 +13,12 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_InstallInfoDialog import Ui_InstallInfoDialog

-from eric7 import Globals
-from eric7.EricGui import EricPixmapCache
-

 class InstallInfoDialog(QDialog, Ui_InstallInfoDialog):
     """
--- a/src/eric7/UI/LogView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/LogView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,22 +7,21 @@
 Module implementing the log viewer widget and the log widget.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QRegularExpression
+from PyQt6.QtCore import QRegularExpression, Qt, pyqtSignal
 from PyQt6.QtGui import QBrush, QTextCursor, QTextDocument
 from PyQt6.QtWidgets import (
-    QTextEdit,
     QApplication,
+    QHBoxLayout,
     QMenu,
+    QSizePolicy,
+    QTextEdit,
     QWidget,
-    QHBoxLayout,
-    QSizePolicy,
 )

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-

 class LogViewer(QWidget):
     """
--- a/src/eric7/UI/NotificationWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/NotificationWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,14 +10,14 @@
 import contextlib
 import enum

-from PyQt6.QtCore import Qt, QTimer, QPoint
-from PyQt6.QtWidgets import QFrame, QWidget, QVBoxLayout
-
-from .Ui_NotificationFrame import Ui_NotificationFrame
+from PyQt6.QtCore import QPoint, Qt, QTimer
+from PyQt6.QtWidgets import QFrame, QVBoxLayout, QWidget

 from eric7 import Globals, Preferences
 from eric7.EricGui import EricPixmapCache

+from .Ui_NotificationFrame import Ui_NotificationFrame
+

 class NotificationTypes(enum.Enum):
     """
--- a/src/eric7/UI/NumbersWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/NumbersWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a widget to show numbers in different formats.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel
-from PyQt6.QtWidgets import QWidget, QHeaderView
+from PyQt6.QtCore import QAbstractTableModel, Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QHeaderView, QWidget

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_NumbersWidget import Ui_NumbersWidget

-from eric7.EricGui import EricPixmapCache
-

 class BinaryModel(QAbstractTableModel):
     """
--- a/src/eric7/UI/Previewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/Previewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QTimer
+from PyQt6.QtCore import QTimer, pyqtSlot
 from PyQt6.QtWidgets import QStackedWidget

 from eric7 import Preferences
--- a/src/eric7/UI/Previewers/MarkdownExtensions.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/Previewers/MarkdownExtensions.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 import re

 from markdown.extensions import Extension
+from markdown.inlinepatterns import SimpleTagInlineProcessor
 from markdown.preprocessors import Preprocessor

-from markdown.inlinepatterns import SimpleTagInlineProcessor
-
 ######################################################################
 ## Code below is an enhanced copy of the Mermaid extension
 ##
--- a/src/eric7/UI/Previewers/PreviewerHTML.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/Previewers/PreviewerHTML.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,32 +7,31 @@
 Module implementing a previewer widget for HTML, Markdown and ReST files.
 """

+import contextlib
+import io
 import os
-import threading
 import re
 import shutil
+import sys
 import tempfile
-import sys
-import io
-import contextlib
+import threading

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QThread
+from PyQt6.QtCore import Qt, QThread, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QCursor, QGuiApplication
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QCheckBox,
+    QGridLayout,
     QLabel,
-    QCheckBox,
+    QPushButton,
     QSizePolicy,
     QToolTip,
-    QGridLayout,
-    QPushButton,
+    QVBoxLayout,
+    QWidget,
 )

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences, Utilities
-

 class PreviewerHTML(QWidget):
     """
@@ -763,8 +762,7 @@
                 """installation instructions.</a></p>"""
             )

-        from . import PreviewerHTMLStyles
-        from . import MarkdownExtensions
+        from . import MarkdownExtensions, PreviewerHTMLStyles

         extensions = []
--- a/src/eric7/UI/Previewers/PreviewerQSS.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/Previewers/PreviewerQSS.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,16 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QWidget, QMenu, QLabel, QHeaderView, QListWidgetItem
-
-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_PreviewerQSS import Ui_PreviewerQSS
+from PyQt6.QtCore import Qt, pyqtSlot
+from PyQt6.QtWidgets import QHeaderView, QLabel, QListWidgetItem, QMenu, QWidget

 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.Globals import getConfig

-from eric7.Globals import getConfig
+from .Ui_PreviewerQSS import Ui_PreviewerQSS


 class PreviewerQSS(QWidget, Ui_PreviewerQSS):
--- a/src/eric7/UI/PythonAstViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/PythonAstViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,20 @@

 import ast

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from asttokens import ASTTokens
+from PyQt6.QtCore import Qt, QTimer, pyqtSlot
 from PyQt6.QtGui import QBrush
 from PyQt6.QtWidgets import (
+    QAbstractItemView,
     QTreeWidget,
     QTreeWidgetItem,
-    QAbstractItemView,
+    QVBoxLayout,
     QWidget,
-    QVBoxLayout,
 )

-from asttokens import ASTTokens
-
+from eric7 import Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

-from eric7 import Preferences
-

 class PythonAstViewer(QWidget):
     """
--- a/src/eric7/UI/PythonDisViewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/PythonDisViewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,20 +8,17 @@
 Python sources.
 """

+import dis
+import enum
 import os
-import dis
-
-import enum
-

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer
+from PyQt6.QtCore import Qt, QTimer, pyqtSlot
 from PyQt6.QtGui import QBrush
-from PyQt6.QtWidgets import QTreeWidgetItem, QAbstractItemView, QWidget, QMenu
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from PyQt6.QtWidgets import QAbstractItemView, QMenu, QTreeWidgetItem, QWidget

 from eric7 import Preferences
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_PythonDisViewer import Ui_PythonDisViewer
--- a/src/eric7/UI/SearchWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/SearchWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing the search box for the shell and log viewer.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
-from PyQt6.QtWidgets import QWidget, QSpacerItem, QSizePolicy
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QSizePolicy, QSpacerItem, QWidget

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/UI/SplashScreen.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/SplashScreen.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a splashscreen for eric.
 """

+import logging
 import os.path
-import logging

 from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QPixmap, QColor
+from PyQt6.QtGui import QColor, QPixmap
 from PyQt6.QtWidgets import QApplication, QSplashScreen

 from eric7.Globals import getConfig
--- a/src/eric7/UI/SymbolsWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/SymbolsWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,28 @@
 Module implementing a widget to select a symbol in various formats.
 """

+import html.entities
 import sys
 import unicodedata
-import html.entities

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
     QAbstractTableModel,
+    QItemSelectionModel,
+    QLocale,
     QModelIndex,
     Qt,
-    QItemSelectionModel,
-    QLocale,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QColor
-from PyQt6.QtWidgets import QWidget, QHeaderView, QAbstractItemView
+from PyQt6.QtWidgets import QAbstractItemView, QHeaderView, QWidget

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_SymbolsWidget import Ui_SymbolsWidget

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class SymbolsModel(QAbstractTableModel):
     """
--- a/src/eric7/UI/UserInterface.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/UserInterface.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,79 +7,74 @@
 Module implementing the main user interface.
 """

-import os
-import sys
-import logging
-import shutil
-import json
+import contextlib
 import datetime
-import getpass
 import functools
-import contextlib
+import getpass
+import json
+import logging
+import os
 import pathlib
-
+import shutil
+import sys
+
+from PyQt6.Qsci import QSCINTILLA_VERSION_STR
 from PyQt6.QtCore import (
-    pyqtSlot,
-    QTimer,
-    QFile,
-    pyqtSignal,
     PYQT_VERSION_STR,
     QDate,
+    QFile,
     QIODevice,
-    qVersion,
+    QObject,
     QProcess,
     QSize,
+    Qt,
+    QThread,
+    QTimer,
     QUrl,
-    QObject,
-    Qt,
+    QUrlQuery,
     QUuid,
-    QThread,
-    QUrlQuery,
+    pyqtSignal,
+    pyqtSlot,
+    qVersion,
 )
-from PyQt6.QtGui import QAction, QKeySequence, QDesktopServices, QSessionManager
+from PyQt6.QtGui import QAction, QDesktopServices, QKeySequence, QSessionManager
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkProxyFactory
 from PyQt6.QtWidgets import (
-    QSizePolicy,
-    QWidget,
-    QWhatsThis,
-    QToolBar,
+    QApplication,
     QDialog,
-    QSplitter,
-    QApplication,
-    QMenu,
-    QVBoxLayout,
     QDockWidget,
     QLabel,
+    QMenu,
+    QSizePolicy,
+    QSplitter,
+    QToolBar,
+    QVBoxLayout,
+    QWhatsThis,
+    QWidget,
 )
-from PyQt6.Qsci import QSCINTILLA_VERSION_STR
-from PyQt6.QtNetwork import QNetworkProxyFactory, QNetworkAccessManager
-
-from .Info import Version, VersionOnly, BugAddress, Program, FeatureAddress
-from . import Config
-from .NotificationWidget import NotificationTypes
-
-from eric7.EricWidgets.EricSingleApplication import EricSingleApplicationServer
+
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction, createActionGroup
-from eric7.EricWidgets.EricToolBarManager import EricToolBarManager
-from eric7.EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
-
-from eric7.Globals import getConfig
-from eric7 import Globals, Preferences, Utilities
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7.Sessions.SessionFile import SessionFile
-
-from eric7.Tasks.TasksFile import TasksFile
-
 from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
 from eric7.EricNetwork.EricNetworkProxyFactory import (
     EricNetworkProxyFactory,
     proxyAuthenticationRequired,
 )
+from eric7.EricWidgets import EricErrorMessage, EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricSingleApplication import EricSingleApplicationServer
+from eric7.EricWidgets.EricToolBarManager import EricToolBarManager
+from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
+from eric7.Globals import getConfig
+from eric7.Sessions.SessionFile import SessionFile
+from eric7.Tasks.TasksFile import TasksFile
+
+from . import Config
+from .Info import BugAddress, FeatureAddress, Program, Version, VersionOnly
+from .NotificationWidget import NotificationTypes

 try:
     from eric7.EricNetwork.EricSslErrorHandler import (
@@ -1139,8 +1134,8 @@
         Private method to create the Toolboxes layout.
         """
         from eric7.EricWidgets.EricToolBox import (
+            EricHorizontalToolBox,
             EricVerticalToolBox,
-            EricHorizontalToolBox,
         )

         logging.debug("Creating Toolboxes Layout...")
--- a/src/eric7/UI/VersionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/VersionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,13 @@

 import sys

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QGuiApplication
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox

 from .Ui_VersionsDialog import Ui_VersionsDialog
--- a/src/eric7/UI/upgrader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/UI/upgrader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,7 +16,6 @@
 import sys
 import time

-
 _pyqtPackages = [
     "pyqt6",
     "pyqt6-sip",
--- a/src/eric7/Utilities/AutoSaver.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/AutoSaver.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing an auto saver class.
 """

-from PyQt6.QtCore import QObject, QBasicTimer, QTime
+from PyQt6.QtCore import QBasicTimer, QObject, QTime


 class AutoSaver(QObject):
--- a/src/eric7/Utilities/BackgroundClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/BackgroundClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,6 +18,7 @@
 import sys
 import time
 import traceback
+
 from zlib import adler32
--- a/src/eric7/Utilities/BackgroundService.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/BackgroundService.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,15 +13,16 @@
 import os
 import struct
 import sys
+
 from zlib import adler32

-from PyQt6.QtCore import QProcess, pyqtSignal, QTimer, QThread
+from PyQt6.QtCore import QProcess, QThread, QTimer, pyqtSignal
+from PyQt6.QtNetwork import QHostAddress, QTcpServer
 from PyQt6.QtWidgets import QApplication
-from PyQt6.QtNetwork import QTcpServer, QHostAddress

+from eric7 import Globals, Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7 import Globals, Preferences, Utilities


 class BackgroundService(QTcpServer):
--- a/src/eric7/Utilities/ClassBrowsers/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,8 +18,8 @@
 </ul>
 """

+import importlib
 import os
-import importlib

 from eric7 import Preferences
--- a/src/eric7/Utilities/ClassBrowsers/idlclbr.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/idlclbr.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,6 +18,7 @@

 from eric7 import Utilities
 from eric7.Utilities import ClassBrowsers
+
 from . import ClbrBaseClasses

 SUPPORTED_TYPES = [ClassBrowsers.IDL_SOURCE]
--- a/src/eric7/Utilities/ClassBrowsers/jsclbr.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/jsclbr.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,6 +14,7 @@

 from eric7 import Utilities
 from eric7.Utilities import ClassBrowsers
+
 from . import ClbrBaseClasses

 SUPPORTED_TYPES = [ClassBrowsers.JS_SOURCE]
--- a/src/eric7/Utilities/ClassBrowsers/protoclbr.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/protoclbr.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,6 +14,7 @@

 from eric7 import Utilities
 from eric7.Utilities import ClassBrowsers
+
 from . import ClbrBaseClasses

 SUPPORTED_TYPES = [ClassBrowsers.PROTO_SOURCE]
--- a/src/eric7/Utilities/ClassBrowsers/pyclbr.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/pyclbr.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,12 +10,14 @@
 to find out the superclasses of a class as well as its attributes.
 """

+import re
 import sys
-import re
+
 from functools import reduce

 from eric7 import Utilities
 from eric7.Utilities import ClassBrowsers
+
 from . import ClbrBaseClasses

 TABWIDTH = 4
--- a/src/eric7/Utilities/ClassBrowsers/rbclbr.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/rbclbr.py	Fri Nov 04 13:52:26 2022 +0100
@@ -16,6 +16,7 @@

 from eric7 import Utilities
 from eric7.Utilities import ClassBrowsers
+
 from . import ClbrBaseClasses

 SUPPORTED_TYPES = [ClassBrowsers.RB_SOURCE]
--- a/src/eric7/Utilities/FtpUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/FtpUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import os

-from PyQt6.QtCore import QObject, QDate, QDateTime, QTime
+from PyQt6.QtCore import QDate, QDateTime, QObject, QTime

 from eric7.EricNetwork.EricUrlInfo import EricUrlInfo, EricUrlPermission
--- a/src/eric7/Utilities/GetSysPath.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/GetSysPath.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module to get sys.path of an external interpreter.
 """

+import json
 import sys
-import json

 if __name__ == "__main__":
     # print sys.path to stdout
--- a/src/eric7/Utilities/ModuleParser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/ModuleParser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,14 +14,15 @@
 </ul>
 """

-import sys
-import os
+import contextlib
 import importlib.machinery
+import os
 import re
-import contextlib
+import sys
+
+from functools import reduce

 from eric7 import Utilities
-from functools import reduce

 __all__ = [
     "Module",
--- a/src/eric7/Utilities/MouseUtilities.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/MouseUtilities.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing utility functions related to Mouse stuff.
 """

-from PyQt6.QtCore import Qt, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt

 from eric7 import Globals
--- a/src/eric7/Utilities/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -47,46 +47,42 @@

 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32

+from PyQt6.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla
 from PyQt6.QtCore import (
-    qVersion,
     PYQT_VERSION_STR,
-    QDir,
-    QProcess,
     QByteArray,
     QCoreApplication,
     QCryptographicHash,
+    QDir,
+    QProcess,
+    qVersion,
 )
-from PyQt6.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla
+
+from eric7 import Preferences
+from eric7.EricWidgets.EricApplication import ericApp

 # import these methods into the Utilities namespace
 from eric7.Globals import (  # __IGNORE_WARNING__
-    isWindowsPlatform,
-    isLinuxPlatform,
-    isMacPlatform,
     desktopName,
-    sessionType,
+    getConfig,
     getConfigDir,
-    setConfigDir,
+    getPyQt6ModulesDirectory,
+    getPyQtToolsPath,
+    getPythonExecutable,
     getPythonLibraryDirectory,
     getPythonScriptsDirectory,
-    getPyQt6ModulesDirectory,
     getQtBinariesPath,
-    getPyQtToolsPath,
+    isLinuxPlatform,
+    isMacPlatform,
+    isWindowsPlatform,
     qVersionTuple,
-    getPythonExecutable,
+    sessionType,
+    setConfigDir,
 )
-
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.UI.Info import Program, Version
-
-from eric7 import Preferences
-from eric7.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck import (
-    # __IGNORE_WARNING__
+from eric7.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck import (  # __IGNORE_WARNING__
     normalizeCode,
 )
-
-from eric7.Globals import getConfig
+from eric7.UI.Info import Program, Version

 configDir = None

@@ -2072,6 +2068,7 @@
     info.append("  sip {0}".format(sip_version_str))
     with contextlib.suppress(ImportError):
         from PyQt6 import QtWebEngineWidgets  # __IGNORE_WARNING__
+
         from eric7.WebBrowser.Tools import WebBrowserTools

         (
--- a/src/eric7/Utilities/crypto/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/crypto/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Package implementing cryptography related functionality.
 """

+import base64
 import random
-import base64

 from PyQt6.QtCore import QCoreApplication
-from PyQt6.QtWidgets import QLineEdit, QInputDialog
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtWidgets import QInputDialog, QLineEdit

 from eric7 import Preferences
+from eric7.EricWidgets import EricMessageBox

 ###############################################################################
 ## password handling functions below
--- a/src/eric7/Utilities/crypto/py3AES.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/crypto/py3AES.py	Fri Nov 04 13:52:26 2022 +0100
@@ -25,8 +25,8 @@
 Advanced Encryption Standard.
 """

+import math
 import os
-import math


 def append_PKCS7_padding(b):
--- a/src/eric7/Utilities/crypto/py3PBKDF2.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/Utilities/crypto/py3PBKDF2.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing PBKDF2 functions.
 """

+import base64
 import hashlib
 import hmac
 import os
-import base64

 Hashes = {
     "sha1": hashlib.sha1,
--- a/src/eric7/VCS/CommandOptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/CommandOptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QDialog

-from .Ui_CommandOptionsDialog import Ui_VcsCommandOptionsDialog
+from eric7 import Utilities

-from eric7 import Utilities
+from .Ui_CommandOptionsDialog import Ui_VcsCommandOptionsDialog


 class VcsCommandOptionsDialog(QDialog, Ui_VcsCommandOptionsDialog):
--- a/src/eric7/VCS/ProjectBrowserHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/ProjectBrowserHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,20 +9,17 @@

 import os

-from PyQt6.QtCore import QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
-
 from eric7.Project.ProjectBrowserModel import (
+    ProjectBrowserDirectoryItem,
+    ProjectBrowserFileItem,
     ProjectBrowserSimpleDirectoryItem,
-    ProjectBrowserFileItem,
-    ProjectBrowserDirectoryItem,
 )
-
-from eric7 import Preferences
+from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog


 class VcsProjectBrowserHelper(QObject):
--- a/src/eric7/VCS/ProjectHelper.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/ProjectHelper.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,19 @@
 Module implementing the base class of the VCS project helper.
 """

+import copy
 import os
+import pathlib
 import shutil
-import copy
-import pathlib

-from PyQt6.QtCore import pyqtSlot, QObject, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QObject, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QToolBar

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config
--- a/src/eric7/VCS/StatusMonitorLed.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/StatusMonitorLed.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,11 +10,10 @@

 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QColor
-from PyQt6.QtWidgets import QWidget, QInputDialog, QMenu, QHBoxLayout, QLabel
-
-from eric7.EricWidgets.EricLed import EricClickableLed, EricLedType
+from PyQt6.QtWidgets import QHBoxLayout, QInputDialog, QLabel, QMenu, QWidget

 from eric7 import Preferences
+from eric7.EricWidgets.EricLed import EricClickableLed, EricLedType


 class StatusMonitorLed(EricClickableLed):
--- a/src/eric7/VCS/StatusMonitorThread.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/StatusMonitorThread.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import QThread, QMutex, QWaitCondition, pyqtSignal, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QMutex, QThread, QWaitCondition, pyqtSignal


 class VcsStatusMonitorThread(QThread):
--- a/src/eric7/VCS/StatusWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/StatusWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,30 +10,29 @@
 import contextlib
 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QEvent
+from PyQt6.QtCore import QEvent, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QAbstractItemView,
+    QDialog,
+    QGroupBox,
     QHBoxLayout,
     QLabel,
-    QSizePolicy,
     QListView,
     QListWidget,
     QListWidgetItem,
+    QMenu,
+    QSizePolicy,
     QToolButton,
-    QAbstractItemView,
-    QMenu,
-    QGroupBox,
-    QDialog,
+    QVBoxLayout,
+    QWidget,
 )

-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-from eric7.EricWidgets.EricSpellCheckedTextEdit import EricSpellCheckedTextEdit
-from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
-
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricListSelectionDialog import EricListSelectionDialog
+from eric7.EricWidgets.EricSpellCheckedTextEdit import EricSpellCheckedTextEdit


 class StatusWidget(QWidget):
--- a/src/eric7/VCS/VersionControl.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VCS/VersionControl.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,22 +13,21 @@
 import os

 from PyQt6.QtCore import (
+    QCoreApplication,
+    QLockFile,
+    QMutex,
     QObject,
-    QThread,
-    QMutex,
     QProcess,
     Qt,
+    QThread,
     pyqtSignal,
-    QCoreApplication,
-    QLockFile,
 )
 from PyQt6.QtWidgets import QApplication

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Preferences
-

 class VersionControl(QObject):
     """
--- a/src/eric7/ViewManager/BookmarkedFilesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/ViewManager/BookmarkedFilesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,7 @@

 from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QColor
-from PyQt6.QtWidgets import QListWidgetItem, QDialog
+from PyQt6.QtWidgets import QDialog, QListWidgetItem

 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
--- a/src/eric7/ViewManager/ViewManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/ViewManager/ViewManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,38 +7,33 @@
 Module implementing the view manager base class.
 """

-import re
+import contextlib
 import os
 import pathlib
-import contextlib
-
+import re
+
+from PyQt6.Qsci import QsciScintilla
 from PyQt6.QtCore import (
+    QCoreApplication,
+    QPoint,
+    QSignalMapper,
+    Qt,
+    QTimer,
     pyqtSignal,
     pyqtSlot,
-    Qt,
-    QSignalMapper,
-    QTimer,
-    QPoint,
-    QCoreApplication,
 )
 from PyQt6.QtGui import QKeySequence, QPixmap
-from PyQt6.QtWidgets import QToolBar, QDialog, QApplication, QMenu, QWidget
-from PyQt6.Qsci import QsciScintilla
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricFileDialog, EricMessageBox
-
-from eric7.Globals import recentNameFiles, isMacPlatform
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QToolBar, QWidget

 from eric7 import Preferences, Utilities
-
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricAction import EricAction, createActionGroup
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import isMacPlatform, recentNameFiles
 from eric7.QScintilla.Editor import Editor
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config

-from eric7.EricGui.EricAction import EricAction, createActionGroup
-

 class ViewManager(QWidget):
     """
--- a/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvAddEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,15 +9,14 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Globals, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_VirtualenvAddEditDialog import Ui_VirtualenvAddEditDialog

-from eric7 import Globals, Utilities
-

 class VirtualenvAddEditDialog(QDialog, Ui_VirtualenvAddEditDialog):
     """
--- a/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,16 +11,15 @@
 import os
 import re

-from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
+from PyQt6.QtCore import QProcess, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import CondaInterface, Globals, Preferences, Utilities
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricApplication import ericApp

 from .Ui_VirtualenvConfigurationDialog import Ui_VirtualenvConfigurationDialog

-from eric7 import CondaInterface, Globals, Preferences, Utilities
-

 class VirtualenvConfigurationDialog(QDialog, Ui_VirtualenvConfigurationDialog):
     """
--- a/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvExecDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,10 @@
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog
+from eric7 import Preferences
+from eric7.Globals import getPythonExecutable, isWindowsPlatform

-from eric7 import Preferences
-from eric7.Globals import isWindowsPlatform, getPythonExecutable
+from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog


 class VirtualenvExecDialog(QDialog, Ui_VirtualenvExecDialog):
--- a/src/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvInterpreterSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,14 +14,13 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Globals
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_VirtualenvInterpreterSelectionDialog import (
     Ui_VirtualenvInterpreterSelectionDialog,
 )

-from eric7 import Globals
-

 class VirtualenvInterpreterSelectionDialog(
     QDialog, Ui_VirtualenvInterpreterSelectionDialog
--- a/src/eric7/VirtualEnv/VirtualenvManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,19 @@
 Module implementing a class to manage Python virtual environments.
 """

-import os
-import sys
-import shutil
+import copy
 import json
-import copy
+import os
+import shutil
+import sys

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject
+from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7 import Globals, Preferences
-

 class VirtualenvManager(QObject):
     """
--- a/src/eric7/VirtualEnv/VirtualenvManagerWidgets.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvManagerWidgets.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,23 +10,22 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QWidget,
     QDialog,
     QDialogButtonBox,
+    QHeaderView,
     QTreeWidgetItem,
-    QHeaderView,
     QVBoxLayout,
+    QWidget,
 )

-from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
-from eric7.EricWidgets.EricMainWindow import EricMainWindow
-
-from .Ui_VirtualenvManagerWidget import Ui_VirtualenvManagerWidget
-
 from eric7 import Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricMainWindow import EricMainWindow
+from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+
+from .Ui_VirtualenvManagerWidget import Ui_VirtualenvManagerWidget


 class VirtualenvManagerWidget(QWidget, Ui_VirtualenvManagerWidget):
--- a/src/eric7/VirtualEnv/VirtualenvNameDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvNameDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 environment.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_VirtualenvNameDialog import Ui_VirtualenvNameDialog
--- a/src/eric7/VirtualEnv/VirtualenvUpgradeConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvUpgradeConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,17 +10,16 @@

 import re

-from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
+from PyQt6.QtCore import QProcess, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

+from eric7 import Globals, Preferences, Utilities
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_VirtualenvUpgradeConfigurationDialog import (
     Ui_VirtualenvUpgradeConfigurationDialog,
 )

-from eric7 import Globals, Preferences, Utilities
-

 class VirtualenvUpgradeConfigurationDialog(
     QDialog, Ui_VirtualenvUpgradeConfigurationDialog
--- a/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/VirtualEnv/VirtualenvUpgradeExecDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,10 @@
 from PyQt6.QtCore import QProcess, QTimer
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

-from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog
+from eric7 import Preferences
+from eric7.Globals import getPythonExecutable

-from eric7.Globals import getPythonExecutable
-from eric7 import Preferences
+from .Ui_VirtualenvExecDialog import Ui_VirtualenvExecDialog


 class VirtualenvUpgradeExecDialog(QDialog, Ui_VirtualenvExecDialog):
--- a/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,15 @@
 Module implementing the AdBlock configuration dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QTimer, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, QTimer, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QMenu, QToolButton

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_AdBlockDialog import Ui_AdBlockDialog

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class AdBlockDialog(QDialog, Ui_AdBlockDialog):
     """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockExceptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to configure the AdBlock exceptions.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_AdBlockExceptionsDialog import Ui_AdBlockExceptionsDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_AdBlockExceptionsDialog import Ui_AdBlockExceptionsDialog


 class AdBlockExceptionsDialog(QDialog, Ui_AdBlockExceptionsDialog):
--- a/src/eric7/WebBrowser/AdBlock/AdBlockIcon.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockIcon.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,10 +10,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricClickableLabel import EricClickableLabel

-from eric7.EricGui import EricPixmapCache
-

 class AdBlockIcon(EricClickableLabel):
     """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,22 +7,20 @@
 Module implementing the AdBlock manager.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject, QUrl, QUrlQuery, QByteArray, QMutex
+from PyQt6.QtCore import QByteArray, QMutex, QObject, QUrl, QUrlQuery, pyqtSignal
 from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo

+from eric7 import Preferences, Utilities
+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets import EricMessageBox
+from eric7.Utilities.AutoSaver import AutoSaver

-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
-
+from .AdBlockMatcher import AdBlockMatcher
 from .AdBlockSubscription import AdBlockSubscription
 from .AdBlockUrlInterceptor import AdBlockUrlInterceptor
-from .AdBlockMatcher import AdBlockMatcher
-
-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences, Utilities


 class AdBlockManager(QObject):
@@ -347,8 +345,9 @@
             ).format(title),
         )
         if res:
+            from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
             from .AdBlockSubscription import AdBlockSubscription
-            from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

             dlg = WebBrowserWindow.adBlockManager().showDialog()
             subscription = AdBlockSubscription(
--- a/src/eric7/WebBrowser/AdBlock/AdBlockMatcher.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockMatcher.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtCore import QObject

+from .AdBlockRule import AdBlockRule, AdBlockRuleOption
 from .AdBlockSearchTree import AdBlockSearchTree
-from .AdBlockRule import AdBlockRule, AdBlockRuleOption


 class AdBlockMatcher(QObject):
--- a/src/eric7/WebBrowser/AdBlock/AdBlockRule.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockRule.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,6 +8,7 @@
 """

 import re
+
 from enum import IntEnum

 from PyQt6.QtCore import Qt
--- a/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,29 +7,28 @@
 Module implementing the AdBlock subscription class.
 """

+import base64
+import hashlib
 import os
 import re
-import hashlib
-import base64

 from PyQt6.QtCore import (
-    pyqtSignal,
-    Qt,
+    QByteArray,
+    QCryptographicHash,
+    QDate,
+    QDateTime,
     QObject,
-    QByteArray,
-    QDateTime,
+    Qt,
+    QTime,
     QUrl,
     QUrlQuery,
-    QCryptographicHash,
-    QDate,
-    QTime,
+    pyqtSignal,
 )
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox

-from eric7 import Preferences, Utilities
-

 class AdBlockSubscription(QObject):
     """
--- a/src/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockTreeWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,19 +8,19 @@
 """

 from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QFont, QColor
+from PyQt6.QtGui import QColor, QFont
 from PyQt6.QtWidgets import (
     QAbstractItemView,
-    QTreeWidgetItem,
+    QApplication,
     QInputDialog,
     QLineEdit,
     QMenu,
-    QApplication,
+    QTreeWidgetItem,
 )

-from eric7.EricWidgets.EricTreeWidget import EricTreeWidget, EricTreeWidgetItemsState
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricTreeWidget import EricTreeWidget, EricTreeWidgetItemsState


 class AdBlockTreeWidget(EricTreeWidget):
--- a/src/eric7/WebBrowser/AutoScroll/AutoScroller.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AutoScroll/AutoScroller.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,14 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt6.QtCore import Qt, QObject, QRect, QEvent, QPoint
+from PyQt6.QtCore import QEvent, QObject, QPoint, QRect, Qt
 from PyQt6.QtWidgets import QApplication, QLabel

-from .FrameScroller import FrameScroller
-
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache

+from .FrameScroller import FrameScroller
+

 class AutoScroller(QObject):
     """
--- a/src/eric7/WebBrowser/AutoScroll/FrameScroller.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/AutoScroll/FrameScroller.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,7 +14,7 @@

 import math

-from PyQt6.QtCore import pyqtSlot, QObject, QTimer
+from PyQt6.QtCore import QObject, QTimer, pyqtSlot


 class FrameScroller(QObject):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to manage bookmarks.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QModelIndex
-from PyQt6.QtGui import QFontMetrics, QCursor
-from PyQt6.QtWidgets import QDialog, QMenu, QApplication, QInputDialog, QLineEdit
+from PyQt6.QtCore import QModelIndex, Qt, QUrl, pyqtSignal
+from PyQt6.QtGui import QCursor, QFontMetrics
+from PyQt6.QtWidgets import QApplication, QDialog, QInputDialog, QLineEdit, QMenu

 from eric7.EricCore.EricTreeSortFilterProxyModel import EricTreeSortFilterProxyModel
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,18 +9,16 @@

 import os

-from PyQt6.QtCore import pyqtSlot, Qt, QSize
+from PyQt6.QtCore import QSize, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QListWidgetItem

+from eric7 import Globals
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

+from . import BookmarksImporters
 from .Ui_BookmarksImportDialog import Ui_BookmarksImportDialog

-from . import BookmarksImporters
-
-from eric7 import Globals
-

 class BookmarksImportDialog(QDialog, Ui_BookmarksImportDialog):
     """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/ChromeImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,15 @@
 Module implementing an importer for Chrome bookmarks.
 """

+import json
 import os
-import json

 from PyQt6.QtCore import QCoreApplication, QDate, Qt

-from .BookmarksImporter import BookmarksImporter
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/FirefoxImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,10 @@

 from PyQt6.QtCore import QCoreApplication, QDate, Qt, QUrl

-from .BookmarksImporter import BookmarksImporter
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/HtmlImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@

 from PyQt6.QtCore import QCoreApplication, QDate, Qt

-from .BookmarksImporter import BookmarksImporter
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/IExplorerImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,10 @@

 from PyQt6.QtCore import QCoreApplication, QDate, Qt

-from .BookmarksImporter import BookmarksImporter
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/OperaImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,10 +11,10 @@

 from PyQt6.QtCore import QCoreApplication, QDate, Qt

-from .BookmarksImporter import BookmarksImporter
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/SafariImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,10 +12,10 @@

 from PyQt6.QtCore import QCoreApplication, QDate, Qt

-from .BookmarksImporter import BookmarksImporter
+from eric7 import Globals
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals
+from .BookmarksImporter import BookmarksImporter


 def getImporterInfo(sourceId):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/XbelImporter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 import os

-from PyQt6.QtCore import QCoreApplication, QXmlStreamReader, QDate, Qt
+from PyQt6.QtCore import QCoreApplication, QDate, Qt, QXmlStreamReader
+
+from eric7.EricGui import EricPixmapCache

 from .BookmarksImporter import BookmarksImporter

-from eric7.EricGui import EricPixmapCache
-

 def getImporterInfo(sourceId):
     """
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksImporters/__init__.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtCore import QCoreApplication

+from eric7 import Globals
 from eric7.EricGui import EricPixmapCache
-from eric7 import Globals


 def getImporters():
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,31 +7,30 @@
 Module implementing the bookmarks manager.
 """

+import contextlib
 import os
-import contextlib
 import pathlib

 from PyQt6.QtCore import (
-    pyqtSignal,
     QT_TRANSLATE_NOOP,
-    QObject,
+    QCoreApplication,
+    QDateTime,
     QFile,
     QIODevice,
-    QXmlStreamReader,
-    QDateTime,
+    QObject,
     QUrl,
-    QCoreApplication,
+    QXmlStreamReader,
+    pyqtSignal,
 )
-from PyQt6.QtGui import QUndoStack, QUndoCommand
+from PyQt6.QtGui import QUndoCommand, QUndoStack
 from PyQt6.QtWidgets import QDialog

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7 import Utilities
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.Utilities.AutoSaver import AutoSaver

 from .BookmarkNode import BookmarkNode

-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Utilities
-
 BOOKMARKBAR = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Bar")
 BOOKMARKMENU = QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Menu")
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksMenu.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksMenu.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,14 @@
 Module implementing the bookmarks menu.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal
 from PyQt6.QtGui import QCursor
 from PyQt6.QtWidgets import QMenu

 from eric7.EricWidgets.EricModelMenu import EricModelMenu

+from .BookmarkNode import BookmarkNode
 from .BookmarksModel import BookmarksModel
-from .BookmarkNode import BookmarkNode


 class BookmarksMenu(EricModelMenu):
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,15 +10,15 @@
 import contextlib

 from PyQt6.QtCore import (
-    Qt,
     QAbstractItemModel,
-    QModelIndex,
-    QUrl,
+    QBuffer,
     QByteArray,
     QDataStream,
     QIODevice,
-    QBuffer,
     QMimeData,
+    QModelIndex,
+    Qt,
+    QUrl,
 )

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksToolBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,10 +7,10 @@
 Module implementing a tool bar showing bookmarks.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QUrl, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, Qt, QUrl, pyqtSignal
 from PyQt6.QtGui import QCursor
+from PyQt6.QtWebEngineCore import QWebEnginePage
 from PyQt6.QtWidgets import QMenu
-from PyQt6.QtWebEngineCore import QWebEnginePage

 from eric7.EricWidgets.EricModelToolBar import EricModelToolBar
--- a/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/NsHtmlReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 import re

-from PyQt6.QtCore import QObject, QIODevice, QFile, QDateTime
+from PyQt6.QtCore import QDateTime, QFile, QIODevice, QObject
+
+from eric7 import Utilities

 from .BookmarkNode import BookmarkNode

-from eric7 import Utilities
-

 class NsHtmlReader(QObject):
     """
--- a/src/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/NsHtmlWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a class to write Netscape HTML bookmark files.
 """

-from PyQt6.QtCore import QObject, QIODevice, QFile
+from PyQt6.QtCore import QFile, QIODevice, QObject
+
+from eric7 import Utilities

 from .BookmarkNode import BookmarkNode

-from eric7 import Utilities
-

 class NsHtmlWriter(QObject):
     """
--- a/src/eric7/WebBrowser/Bookmarks/XbelReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/XbelReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,14 +8,14 @@
 """

 from PyQt6.QtCore import (
-    QXmlStreamReader,
-    QXmlStreamEntityResolver,
-    QIODevice,
+    QCoreApplication,
+    QDateTime,
     QFile,
-    QCoreApplication,
+    QIODevice,
+    Qt,
+    QXmlStreamEntityResolver,
     QXmlStreamNamespaceDeclaration,
-    QDateTime,
-    Qt,
+    QXmlStreamReader,
 )

 from .BookmarkNode import BookmarkNode
--- a/src/eric7/WebBrowser/Bookmarks/XbelWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Bookmarks/XbelWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write XBEL bookmark files.
 """

-from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile, Qt
+from PyQt6.QtCore import QFile, QIODevice, Qt, QXmlStreamWriter

 from .BookmarkNode import BookmarkNode
--- a/src/eric7/WebBrowser/ClosedTabsManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/ClosedTabsManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to manage closed tabs.
 """

-from PyQt6.QtCore import pyqtSignal, QUrl, QObject
+from PyQt6.QtCore import QObject, QUrl, pyqtSignal


 class ClosedTab:
--- a/src/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/CookieJar/CookieExceptionsModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the cookie exceptions model.
 """

-from PyQt6.QtCore import Qt, QAbstractTableModel, QSize, QModelIndex
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, QSize, Qt
 from PyQt6.QtGui import QFont, QFontMetrics
--- a/src/eric7/WebBrowser/CookieJar/CookieJar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/CookieJar/CookieJar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,14 +9,13 @@

 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QSettings
-from PyQt6.QtNetwork import QNetworkCookieJar, QNetworkCookie
+from PyQt6.QtCore import QSettings, pyqtSignal, pyqtSlot
+from PyQt6.QtNetwork import QNetworkCookie, QNetworkCookieJar

+from eric7 import Preferences, Utilities
+from eric7.Utilities.AutoSaver import AutoSaver
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences, Utilities
-

 class CookieJar(QNetworkCookieJar):
     """
--- a/src/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/CookieJar/CookiesConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,6 @@
 from PyQt6.QtWidgets import QDialog

 from .CookieJar import CookieJar
-
 from .Ui_CookiesConfigurationDialog import Ui_CookiesConfigurationDialog
--- a/src/eric7/WebBrowser/CookieJar/CookiesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/CookieJar/CookiesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a dialog to show all cookies.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QByteArray
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QHeaderView
+from PyQt6.QtCore import QByteArray, Qt, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QHeaderView, QTreeWidgetItem

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/CookieJar/CookiesExceptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,11 @@
 Module implementing a dialog for the configuration of cookie exceptions.
 """

-from PyQt6.QtCore import pyqtSlot, QSortFilterProxyModel
+from PyQt6.QtCore import QSortFilterProxyModel, pyqtSlot
 from PyQt6.QtGui import QFont, QFontMetrics
-from PyQt6.QtWidgets import QDialog, QCompleter
+from PyQt6.QtWidgets import QCompleter, QDialog

 from .CookieExceptionsModel import CookieExceptionsModel
-
 from .Ui_CookiesExceptionsDialog import Ui_CookiesExceptionsDialog
--- a/src/eric7/WebBrowser/Download/DownloadAskActionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadAskActionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QDialog

-from .Ui_DownloadAskActionDialog import Ui_DownloadAskActionDialog
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_DownloadAskActionDialog import Ui_DownloadAskActionDialog


 class DownloadAskActionDialog(QDialog, Ui_DownloadAskActionDialog):
--- a/src/eric7/WebBrowser/Download/DownloadItem.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadItem.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,21 +11,19 @@
 import os
 import pathlib

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, QTime, QUrl, QStandardPaths, QDateTime
+from PyQt6.QtCore import QDateTime, QStandardPaths, QTime, QUrl, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWidgets import QWidget, QStyle, QDialog
 from PyQt6.QtWebEngineCore import QWebEngineDownloadRequest
+from PyQt6.QtWidgets import QDialog, QStyle, QWidget

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog
 from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_DownloadItem import Ui_DownloadItem
-
-from .DownloadUtilities import timeString, dataString, speedString
+from eric7.Utilities import MimeTypes
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

-from eric7.EricGui import EricPixmapCache
-from eric7.Utilities import MimeTypes
+from .DownloadUtilities import dataString, speedString, timeString
+from .Ui_DownloadItem import Ui_DownloadItem


 class DownloadState(enum.Enum):
--- a/src/eric7/WebBrowser/Download/DownloadManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,30 +8,27 @@
 """

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
-    Qt,
+    QBasicTimer,
+    QFileInfo,
     QModelIndex,
-    QFileInfo,
+    Qt,
     QUrl,
-    QBasicTimer,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QCursor, QKeySequence, QShortcut
-from PyQt6.QtWidgets import QDialog, QStyle, QFileIconProvider, QMenu, QApplication
+from PyQt6.QtWidgets import QApplication, QDialog, QFileIconProvider, QMenu, QStyle

+from eric7 import Globals, Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
-from .Ui_DownloadManager import Ui_DownloadManager
+from eric7.Utilities.AutoSaver import AutoSaver
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .DownloadModel import DownloadModel
 from .DownloadUtilities import speedString, timeString
-
-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7.EricGui import EricPixmapCache
-from eric7 import Globals, Preferences
+from .Ui_DownloadManager import Ui_DownloadManager


 class DownloadManager(QDialog, Ui_DownloadManager):
--- a/src/eric7/WebBrowser/Download/DownloadManagerButton.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadManagerButton.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,10 @@
 Module implementing a tool button for the download manager.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-
-from eric7.EricWidgets.EricToolButton import EricToolButton
+from PyQt6.QtCore import Qt, pyqtSlot

 from eric7.EricGui import EricPixmapCache
-
+from eric7.EricWidgets.EricToolButton import EricToolButton
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/Download/DownloadModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Download/DownloadModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the download model.
 """

-from PyQt6.QtCore import Qt, QAbstractListModel, QModelIndex, QMimeData, QUrl
+from PyQt6.QtCore import QAbstractListModel, QMimeData, QModelIndex, Qt, QUrl


 class DownloadModel(QAbstractListModel):
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,13 +9,12 @@

 import contextlib

-from PyQt6.QtCore import pyqtSlot, QUrl
-from PyQt6.QtWidgets import QLabel, QHBoxLayout, QPushButton
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWebEngineCore import QWebEnginePage
-
-from eric7.EricWidgets.EricAnimatedWidget import EricAnimatedWidget
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QPushButton

 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricAnimatedWidget import EricAnimatedWidget


 class FeaturePermissionBar(EricAnimatedWidget):
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,8 +8,8 @@
 """

 from PyQt6.QtCore import QObject
+from PyQt6.QtWebEngineCore import QWebEnginePage
 from PyQt6.QtWidgets import QDialog
-from PyQt6.QtWebEngineCore import QWebEnginePage

 from eric7 import Globals, Preferences
--- a/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the feature permission dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QTreeWidget, QAbstractItemView
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWebEngineCore import QWebEnginePage
+from PyQt6.QtWidgets import QAbstractItemView, QDialog, QTreeWidget, QTreeWidgetItem

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/WebBrowser/Feeds/FeedEditDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Feeds/FeedEditDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to edit feed data.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl
+from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox

 from .Ui_FeedEditDialog import Ui_FeedEditDialog
--- a/src/eric7/WebBrowser/Feeds/FeedsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Feeds/FeedsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,13 @@
 import functools

 from PyQt6.QtCore import QUrl
-from PyQt6.QtWidgets import QDialog, QPushButton, QLabel
-
-from .Ui_FeedsDialog import Ui_FeedsDialog
+from PyQt6.QtWidgets import QDialog, QLabel, QPushButton

 from eric7.EricGui import EricPixmapCache
 from eric7.UI.NotificationWidget import NotificationTypes

+from .Ui_FeedsDialog import Ui_FeedsDialog
+

 class FeedsDialog(QDialog, Ui_FeedsDialog):
     """
--- a/src/eric7/WebBrowser/Feeds/FeedsManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Feeds/FeedsManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,17 @@
 Module implementing a RSS feeds manager dialog.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QXmlStreamReader
+from PyQt6.QtCore import Qt, QUrl, QXmlStreamReader, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QCursor
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QMenu, QApplication
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QTreeWidgetItem

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_FeedsManager import Ui_FeedsManager

-from eric7 import Preferences
-from eric7.EricGui import EricPixmapCache
-

 class FeedsManager(QDialog, Ui_FeedsManager):
     """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,14 +11,14 @@
 import os
 import shutil

-from PyQt6.QtCore import pyqtSlot, QDir
+from PyQt6.QtCore import QDir, pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_GreaseMonkeyAddScriptDialog import Ui_GreaseMonkeyAddScriptDialog
-
 from eric7.EricGui import EricPixmapCache
 from eric7.UI.NotificationWidget import NotificationTypes

+from .Ui_GreaseMonkeyAddScriptDialog import Ui_GreaseMonkeyAddScriptDialog
+

 class GreaseMonkeyAddScriptDialog(QDialog, Ui_GreaseMonkeyAddScriptDialog):
     """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,15 @@
 Module implementing the GreaseMonkey scripts configuration dialog.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl
+from PyQt6.QtCore import Qt, QUrl, pyqtSlot
 from PyQt6.QtGui import QDesktopServices
 from PyQt6.QtWidgets import QDialog, QListWidgetItem

+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox

 from .Ui_GreaseMonkeyConfigurationDialog import Ui_GreaseMonkeyConfigurationDialog

-from eric7.EricGui import EricPixmapCache
-

 class GreaseMonkeyConfigurationDialog(QDialog, Ui_GreaseMonkeyConfigurationDialog):
     """
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListDelegate.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,13 +8,17 @@
 scripts.
 """

-from PyQt6.QtCore import Qt, QSize, QRect
-from PyQt6.QtGui import QFontMetrics, QPalette, QFont
-from PyQt6.QtWidgets import QStyle, QStyledItemDelegate, QApplication
-from PyQt6.QtWidgets import QStyleOptionViewItem
+from PyQt6.QtCore import QRect, QSize, Qt
+from PyQt6.QtGui import QFont, QFontMetrics, QPalette
+from PyQt6.QtWidgets import (
+    QApplication,
+    QStyle,
+    QStyledItemDelegate,
+    QStyleOptionViewItem,
+)

+from eric7 import Globals
 from eric7.EricGui import EricPixmapCache
-from eric7 import Globals


 class GreaseMonkeyConfigurationListDelegate(QStyledItemDelegate):
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationListWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a special list widget for GreaseMonkey scripts.
 """

-from PyQt6.QtCore import pyqtSignal, QRect
+from PyQt6.QtCore import QRect, pyqtSignal
 from PyQt6.QtWidgets import QListWidget, QListWidgetItem

 from .GreaseMonkeyConfigurationListDelegate import GreaseMonkeyConfigurationListDelegate
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationScriptInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,14 +10,13 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

+from eric7.EricGui import EricPixmapCache
+
+from ..GreaseMonkeyScript import GreaseMonkeyScript
 from .Ui_GreaseMonkeyConfigurationScriptInfoDialog import (
     Ui_GreaseMonkeyConfigurationScriptInfoDialog,
 )

-from ..GreaseMonkeyScript import GreaseMonkeyScript
-
-from eric7.EricGui import EricPixmapCache
-

 class GreaseMonkeyConfigurationScriptInfoDialog(
     QDialog, Ui_GreaseMonkeyConfigurationScriptInfoDialog
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyDownloader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@
 import os
 import pathlib

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings
+from PyQt6.QtCore import QObject, QSettings, pyqtSignal, pyqtSlot
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyJsObject.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python side for GreaseMonkey scripts.
 """

-from PyQt6.QtCore import pyqtSlot, QObject, QSettings
+from PyQt6.QtCore import QObject, QSettings, pyqtSlot
 from PyQt6.QtGui import QGuiApplication
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,31 +7,29 @@
 Module implementing the manager for GreaseMonkey scripts.
 """

+import contextlib
 import os
-import contextlib
 import pathlib

 from PyQt6.QtCore import (
+    Q_ARG,
+    QCoreApplication,
+    QDir,
+    QMetaObject,
+    QObject,
+    QSettings,
+    Qt,
+    QTimer,
+    QUrl,
     pyqtSignal,
     pyqtSlot,
-    Qt,
-    QObject,
-    QTimer,
-    QDir,
-    QSettings,
-    QMetaObject,
-    QUrl,
-    Q_ARG,
-    QCoreApplication,
 )
 from PyQt6.QtWidgets import QDialog

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
-
-from eric7 import Preferences, Utilities
-
+from eric7.WebBrowser.JavaScript.ExternalJsObject import ExternalJsObject
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-from eric7.WebBrowser.JavaScript.ExternalJsObject import ExternalJsObject

 from .GreaseMonkeyJsObject import GreaseMonkeyJsObject
--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyScript.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,23 +10,22 @@
 import re

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
-    QObject,
-    QUrl,
     QByteArray,
     QCryptographicHash,
+    QObject,
+    QUrl,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QIcon, QPixmap, QImage
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtGui import QIcon, QImage, QPixmap
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWebEngineCore import QWebEngineScript

-from .GreaseMonkeyJavaScript import bootstrap_js, values_js
-from .GreaseMonkeyDownloader import GreaseMonkeyDownloader
-
 from ..Tools.DelayedFileWatcher import DelayedFileWatcher
 from ..WebBrowserPage import WebBrowserPage
 from ..WebBrowserWindow import WebBrowserWindow
+from .GreaseMonkeyDownloader import GreaseMonkeyDownloader
+from .GreaseMonkeyJavaScript import bootstrap_js, values_js


 class GreaseMonkeyScript(QObject):
--- a/src/eric7/WebBrowser/History/HistoryCompleter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryCompleter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,11 @@

 import re

-from PyQt6.QtCore import Qt, QTimer, QSortFilterProxyModel
-from PyQt6.QtWidgets import QTableView, QAbstractItemView, QCompleter
+from PyQt6.QtCore import QSortFilterProxyModel, Qt, QTimer
+from PyQt6.QtWidgets import QAbstractItemView, QCompleter, QTableView

+from .HistoryFilterModel import HistoryFilterModel
 from .HistoryModel import HistoryModel
-from .HistoryFilterModel import HistoryFilterModel


 class HistoryCompletionView(QTableView):
--- a/src/eric7/WebBrowser/History/HistoryDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,13 @@
 Module implementing a dialog to manage history.
 """

-from PyQt6.QtCore import pyqtSignal, Qt, QUrl
-from PyQt6.QtGui import QFontMetrics, QCursor
-from PyQt6.QtWidgets import QDialog, QMenu, QApplication
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal
+from PyQt6.QtGui import QCursor, QFontMetrics
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu

 from eric7.EricCore.EricTreeSortFilterProxyModel import EricTreeSortFilterProxyModel

 from .HistoryModel import HistoryModel
-
 from .Ui_HistoryDialog import Ui_HistoryDialog
--- a/src/eric7/WebBrowser/History/HistoryFilterModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryFilterModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the history filter model.
 """

-from PyQt6.QtCore import Qt, QDateTime, QModelIndex, QAbstractProxyModel
+from PyQt6.QtCore import QAbstractProxyModel, QDateTime, QModelIndex, Qt

 from .HistoryModel import HistoryModel
--- a/src/eric7/WebBrowser/History/HistoryManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,25 +11,24 @@
 import pathlib

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
-    QDateTime,
+    QByteArray,
+    QDataStream,
     QDate,
-    QTime,
-    QUrl,
-    QTimer,
+    QDateTime,
     QFile,
     QIODevice,
-    QByteArray,
-    QDataStream,
+    QObject,
     QTemporaryFile,
-    QObject,
+    QTime,
+    QTimer,
+    QUrl,
+    pyqtSignal,
+    pyqtSlot,
 )

+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
-
 from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences, Utilities

 HISTORY_VERSION_42 = 42
 HISTORY_VERSION_60 = 60
@@ -151,8 +150,8 @@

         self.__load()

+        from .HistoryFilterModel import HistoryFilterModel
         from .HistoryModel import HistoryModel
-        from .HistoryFilterModel import HistoryFilterModel
         from .HistoryTreeModel import HistoryTreeModel

         self.__historyModel = HistoryModel(self, self)
--- a/src/eric7/WebBrowser/History/HistoryMenu.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryMenu.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,27 +7,26 @@
 Module implementing the history menu.
 """

+import functools
 import sys
-import functools

 from PyQt6.QtCore import (
-    pyqtSignal,
-    Qt,
+    QAbstractProxyModel,
     QMimeData,
-    QUrl,
     QModelIndex,
     QSortFilterProxyModel,
-    QAbstractProxyModel,
+    Qt,
+    QUrl,
+    pyqtSignal,
 )
 from PyQt6.QtWidgets import QMenu

+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricModelMenu import EricModelMenu
-from eric7.EricWidgets import EricMessageBox

 from .HistoryModel import HistoryModel

-from eric7.EricGui import EricPixmapCache
-

 class HistoryMenuModel(QAbstractProxyModel):
     """
--- a/src/eric7/WebBrowser/History/HistoryModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt, QUrl

 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/History/HistoryTreeModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/History/HistoryTreeModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,12 @@

 import bisect

-from PyQt6.QtCore import Qt, QModelIndex, QDate, QAbstractProxyModel
+from PyQt6.QtCore import QAbstractProxyModel, QDate, QModelIndex, Qt
+
+from eric7.EricGui import EricPixmapCache

 from .HistoryModel import HistoryModel

-from eric7.EricGui import EricPixmapCache
-

 class HistoryTreeModel(QAbstractProxyModel):
     """
--- a/src/eric7/WebBrowser/JavaScript/ExternalJsObject.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/JavaScript/ExternalJsObject.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,12 +13,12 @@
 # Copyright (C) David Rosca <nowrep@gmail.com>
 #

-from PyQt6.QtCore import pyqtProperty, QObject
+from PyQt6.QtCore import QObject, pyqtProperty

 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

+from .PasswordManagerJsObject import PasswordManagerJsObject
 from .StartPageJsObject import StartPageJsObject
-from .PasswordManagerJsObject import PasswordManagerJsObject


 class ExternalJsObject(QObject):
--- a/src/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/JavaScript/PasswordManagerJsObject.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python side for calling the password manager.
 """

-from PyQt6.QtCore import pyqtSlot, QObject, QByteArray
+from PyQt6.QtCore import QByteArray, QObject, pyqtSlot


 class PasswordManagerJsObject(QObject):
--- a/src/eric7/WebBrowser/JavaScript/StartPageJsObject.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/JavaScript/StartPageJsObject.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the Python side of the eric home page.
 """

-from PyQt6.QtCore import pyqtSlot, QObject
+from PyQt6.QtCore import QObject, pyqtSlot


 class StartPageJsObject(QObject):
--- a/src/eric7/WebBrowser/Navigation/NavigationBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Navigation/NavigationBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,20 @@
 from PyQt6.QtCore import Qt, QUrl
 from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import (
-    QWidget,
     QHBoxLayout,
+    QMenu,
+    QSizePolicy,
+    QSplitter,
     QStyle,
     QToolButton,
-    QSplitter,
-    QSizePolicy,
-    QMenu,
+    QWidget,
 )

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricToolButton import EricToolButton
-
-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 from eric7.WebBrowser.Download.DownloadManagerButton import DownloadManagerButton
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .ReloadStopButton import ReloadStopButton
--- a/src/eric7/WebBrowser/Navigation/NavigationContainer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Navigation/NavigationContainer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the navigation container widget.
 """

-from PyQt6.QtWidgets import QWidget, QVBoxLayout, QSizePolicy
+from PyQt6.QtWidgets import QSizePolicy, QVBoxLayout, QWidget


 class NavigationContainer(QWidget):
--- a/src/eric7/WebBrowser/Navigation/ReloadStopButton.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Navigation/ReloadStopButton.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,10 @@
 Module implementing a button alternating between reload and stop.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt
-
-from eric7.EricWidgets.EricToolButton import EricToolButton
+from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot

 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets.EricToolButton import EricToolButton


 class ReloadStopButton(EricToolButton):
--- a/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing a scheme handler for the eric: scheme.
 """

-from PyQt6.QtCore import pyqtSignal, QBuffer, QIODevice, QUrlQuery, QMutex
+from PyQt6.QtCore import QBuffer, QIODevice, QMutex, QUrlQuery, pyqtSignal
 from PyQt6.QtWebEngineCore import QWebEngineUrlSchemeHandler

+from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets.EricApplication import ericApp

-from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
-
 from ..Tools.WebBrowserTools import getHtmlPage, getJavascript, pixmapFileToDataUrl

 _SupportedPages = [
--- a/src/eric7/WebBrowser/Network/NetworkManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/NetworkManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,24 @@
 Module implementing a network manager class.
 """

+import contextlib
 import json
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QByteArray
-from PyQt6.QtWidgets import QStyle, QDialog
+from PyQt6.QtCore import QByteArray, pyqtSignal
 from PyQt6.QtNetwork import (
     QNetworkAccessManager,
     QNetworkProxy,
     QNetworkProxyFactory,
     QNetworkRequest,
 )
+from PyQt6.QtWidgets import QDialog, QStyle

+from eric7 import Preferences
+from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
-
+from eric7.Utilities.AutoSaver import AutoSaver
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences

 try:
     from eric7.EricNetwork.EricSslErrorHandler import EricSslErrorHandler
@@ -35,8 +33,8 @@
 except ImportError:
     SSL_AVAILABLE = False

+from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
 from .NetworkUrlInterceptor import NetworkUrlInterceptor
-from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl


 class NetworkManager(QNetworkAccessManager):
--- a/src/eric7/WebBrowser/Network/NetworkUrlInterceptor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/NetworkUrlInterceptor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,16 +10,15 @@

 from PyQt6.QtCore import QMutex, QUrl
 from PyQt6.QtWebEngineCore import (
+    QWebEngineUrlRequestInfo,
     QWebEngineUrlRequestInterceptor,
-    QWebEngineUrlRequestInfo,
 )

+from eric7 import Preferences
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker

 from ..WebBrowserPage import WebBrowserPage

-from eric7 import Preferences
-

 class NetworkUrlInterceptor(QWebEngineUrlRequestInterceptor):
     """
--- a/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the protocol handler manager.
 """

-import os
+import contextlib
 import json
-import contextlib
+import os

 from PyQt6.QtCore import QObject, QUrl
 from PyQt6.QtWebEngineCore import QWebEnginePage
@@ -166,6 +166,7 @@
         Public method to show the protocol handler manager dialog.
         """
         from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
         from .ProtocolHandlerManagerDialog import ProtocolHandlerManagerDialog

         dlg = ProtocolHandlerManagerDialog(self, WebBrowserWindow.getWindow())
--- a/src/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/ProtocolHandlerManagerDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage registered protocol handlers.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

 from .Ui_ProtocolHandlerManagerDialog import Ui_ProtocolHandlerManagerDialog
--- a/src/eric7/WebBrowser/Network/QtHelpSchemeHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/QtHelpSchemeHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,8 +10,8 @@
 import mimetypes
 import os

-from PyQt6.QtCore import pyqtSignal, QByteArray, QIODevice, QBuffer, QMutex
-from PyQt6.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob
+from PyQt6.QtCore import QBuffer, QByteArray, QIODevice, QMutex, pyqtSignal
+from PyQt6.QtWebEngineCore import QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler

 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
--- a/src/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/SendRefererWhitelistDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to manage the Send Referer whitelist.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QSortFilterProxyModel, QStringListModel
+from PyQt6.QtCore import QSortFilterProxyModel, QStringListModel, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit

-from .Ui_SendRefererWhitelistDialog import Ui_SendRefererWhitelistDialog
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_SendRefererWhitelistDialog import Ui_SendRefererWhitelistDialog


 class SendRefererWhitelistDialog(QDialog, Ui_SendRefererWhitelistDialog):
--- a/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Network/SslErrorExceptionsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a dialog to edit the SSL error exceptions.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
-from PyQt6.QtWidgets import QDialog, QTreeWidgetItem, QMenu
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWebEngineCore import QWebEngineCertificateError
+from PyQt6.QtWidgets import QDialog, QMenu, QTreeWidgetItem

 from .Ui_SslErrorExceptionsDialog import Ui_SslErrorExceptionsDialog
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing a dialog for the configuration of search engines.
 """

+from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog
-from PyQt6.QtCore import pyqtSlot

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
+from eric7.EricWidgets import EricFileDialog, EricMessageBox

 from .OpenSearchEngineModel import OpenSearchEngineModel
-
 from .Ui_OpenSearchDialog import Ui_OpenSearchDialog
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngine.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,26 +7,25 @@
 Module implementing the open search engine.
 """

+import json
 import re
-import json

 from PyQt6.QtCore import (
-    pyqtSignal,
-    pyqtSlot,
+    QBuffer,
+    QByteArray,
+    QIODevice,
     QLocale,
+    QObject,
     QUrl,
     QUrlQuery,
-    QByteArray,
-    QBuffer,
-    QIODevice,
-    QObject,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QImage
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkAccessManager, QNetworkReply
-
-from eric7.UI.Info import Program
+from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest

 from eric7 import Preferences, Utilities
+from eric7.UI.Info import Program


 class OpenSearchEngine(QObject):
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineAction.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import QUrl
-from PyQt6.QtGui import QPixmap, QIcon, QAction
+from PyQt6.QtGui import QAction, QIcon, QPixmap


 class OpenSearchEngineAction(QAction):
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchEngineModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,11 +7,11 @@
 Module implementing a model for search engines.
 """

+import contextlib
 import re
-import contextlib

-from PyQt6.QtCore import Qt, QUrl, QAbstractTableModel, QModelIndex
-from PyQt6.QtGui import QPixmap, QIcon
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt, QUrl
+from PyQt6.QtGui import QIcon, QPixmap


 class OpenSearchEngineModel(QAbstractTableModel):
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,17 @@
 Module implementing a manager for open search engines.
 """

+import contextlib
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject, QUrl, QFile, QDir, QIODevice, QUrlQuery
-from PyQt6.QtWidgets import QLineEdit, QInputDialog
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtCore import QDir, QFile, QIODevice, QObject, QUrl, QUrlQuery, pyqtSignal
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
+from PyQt6.QtWidgets import QInputDialog, QLineEdit

+from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox
-
 from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences, Utilities


 class OpenSearchManager(QObject):
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a reader for open search engine descriptions.
 """

-from PyQt6.QtCore import QXmlStreamReader, QIODevice, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QIODevice, QXmlStreamReader


 class OpenSearchReader(QXmlStreamReader):
--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a writer for open search engine descriptions.
 """

-from PyQt6.QtCore import QXmlStreamWriter, QIODevice
+from PyQt6.QtCore import QIODevice, QXmlStreamWriter


 class OpenSearchWriter(QXmlStreamWriter):
--- a/src/eric7/WebBrowser/PageScreenDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/PageScreenDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt, QSize
+from PyQt6.QtCore import QSize, Qt, pyqtSlot
 from PyQt6.QtGui import QImage, QPainter, QPixmap
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

 from eric7.EricWidgets import EricFileDialog, EricMessageBox
--- a/src/eric7/WebBrowser/Passwords/PasswordManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Passwords/PasswordManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -21,13 +21,10 @@
 from PyQt6.QtWidgets import QApplication

 from eric7 import Preferences, Utilities
-
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
-
 from eric7.Utilities import crypto
 from eric7.Utilities.AutoSaver import AutoSaver
-
 from eric7.WebBrowser.Tools import Scripts
 from eric7.WebBrowser.WebBrowserPage import WebBrowserPage
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/Passwords/PasswordModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Passwords/PasswordModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt


 class PasswordModel(QAbstractTableModel):
--- a/src/eric7/WebBrowser/Passwords/PasswordReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Passwords/PasswordReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to read login data files.
 """

-from PyQt6.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication, QUrl
+from PyQt6.QtCore import QCoreApplication, QFile, QIODevice, QUrl, QXmlStreamReader


 class PasswordReader(QXmlStreamReader):
--- a/src/eric7/WebBrowser/Passwords/PasswordWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Passwords/PasswordWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write login data files.
 """

-from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QFile, QIODevice, QXmlStreamWriter


 class PasswordWriter(QXmlStreamWriter):
--- a/src/eric7/WebBrowser/Passwords/PasswordsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Passwords/PasswordsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to show all saved logins.
 """

-from PyQt6.QtCore import pyqtSlot, QSortFilterProxyModel
+from PyQt6.QtCore import QSortFilterProxyModel, pyqtSlot
 from PyQt6.QtGui import QFont, QFontMetrics
 from PyQt6.QtWidgets import QDialog

@@ -38,6 +38,7 @@
         self.removeAllButton.clicked.connect(self.passwordsTable.removeAll)

         from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
         from .PasswordModel import PasswordModel

         self.passwordsTable.verticalHeader().hide()
--- a/src/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/PersonalInformationManager/PersonalDataDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,10 +9,10 @@

 from PyQt6.QtWidgets import QDialog

-from .Ui_PersonalDataDialog import Ui_PersonalDataDialog
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
+from .Ui_PersonalDataDialog import Ui_PersonalDataDialog


 class PersonalDataDialog(QDialog, Ui_PersonalDataDialog):
--- a/src/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/PersonalInformationManager/PersonalInformationManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,7 +10,7 @@

 import functools

-from PyQt6.QtCore import Qt, QObject, QPoint
+from PyQt6.QtCore import QObject, QPoint, Qt
 from PyQt6.QtWidgets import QDialog, QMenu

 from eric7 import Preferences
--- a/src/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,12 +11,10 @@
 import datetime
 import pathlib

-from PyQt6.QtCore import pyqtSignal, QThread, QMutex, QLibraryInfo
+from PyQt6.QtCore import QLibraryInfo, QMutex, QThread, pyqtSignal
 from PyQt6.QtHelp import QHelpEngineCore

-from eric7.Globals import getConfig
-
-from eric7.Globals import qVersionTuple
+from eric7.Globals import getConfig, qVersionTuple


 class HelpDocsInstaller(QThread):
--- a/src/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/HelpIndexWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,18 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QEvent
-from PyQt6.QtGui import QGuiApplication, QClipboard
+from PyQt6.QtCore import QEvent, Qt, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QClipboard, QGuiApplication
 from PyQt6.QtHelp import QHelpLink
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
+    QApplication,
+    QDialog,
     QHBoxLayout,
     QLabel,
     QLineEdit,
     QMenu,
-    QDialog,
-    QApplication,
+    QVBoxLayout,
+    QWidget,
 )
--- a/src/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/HelpSearchWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a window for showing the QtHelp index.
 """

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
-from PyQt6.QtGui import QGuiApplication, QClipboard
-from PyQt6.QtWidgets import QWidget, QVBoxLayout, QTextBrowser, QApplication, QMenu
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QClipboard, QGuiApplication
+from PyQt6.QtWidgets import QApplication, QMenu, QTextBrowser, QVBoxLayout, QWidget


 class HelpSearchWidget(QWidget):
--- a/src/eric7/WebBrowser/QtHelp/HelpTocWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/HelpTocWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing a window for showing the QtHelp TOC.
 """

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl
-from PyQt6.QtGui import QGuiApplication, QClipboard
-from PyQt6.QtWidgets import QWidget, QVBoxLayout, QMenu, QApplication
+from PyQt6.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QClipboard, QGuiApplication
+from PyQt6.QtWidgets import QApplication, QMenu, QVBoxLayout, QWidget


 class HelpTocWidget(QWidget):
--- a/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationConfigurationDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationConfigurationDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,14 +8,13 @@
 """

 from PyQt6.QtCore import pyqtSlot
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

+from .QtHelpDocumentationSettings import QtHelpDocumentationSettings
 from .Ui_QtHelpDocumentationConfigurationDialog import (
     Ui_QtHelpDocumentationConfigurationDialog,
 )

-from .QtHelpDocumentationSettings import QtHelpDocumentationSettings
-

 class QtHelpDocumentationConfigurationDialog(
     QDialog, Ui_QtHelpDocumentationConfigurationDialog
--- a/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,7 +11,7 @@
 import os
 import shutil

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QTreeWidgetItem

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSettingsWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/QtHelpDocumentationSettingsWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,14 @@
 Module implementing a widget to manage the QtHelp documentation settings.
 """

-from PyQt6.QtCore import pyqtSlot, pyqtSignal
-from PyQt6.QtWidgets import QWidget, QListWidgetItem, QDialog
+from PyQt6.QtCore import pyqtSignal, pyqtSlot
+from PyQt6.QtWidgets import QDialog, QListWidgetItem, QWidget

+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from .Ui_QtHelpDocumentationSettingsWidget import Ui_QtHelpDocumentationSettingsWidget

 from .QtHelpDocumentationSettings import QtHelpDocumentationSettings
+from .Ui_QtHelpDocumentationSettingsWidget import Ui_QtHelpDocumentationSettingsWidget


 class QtHelpDocumentationSettingsWidget(QWidget, Ui_QtHelpDocumentationSettingsWidget):
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingAPIClient.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,19 +7,19 @@
 Module implementing the low level interface for Google Safe Browsing.
 """

+import base64
 import json
-import base64

 from PyQt6.QtCore import (
-    pyqtSignal,
-    QObject,
-    QDateTime,
-    QUrl,
     QByteArray,
     QCoreApplication,
+    QDateTime,
     QEventLoop,
+    QObject,
+    QUrl,
+    pyqtSignal,
 )
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingCache.py	Fri Nov 04 13:52:26 2022 +0100
@@ -17,11 +17,11 @@
 import os

 from PyQt6.QtCore import (
-    QObject,
     QByteArray,
+    QCoreApplication,
     QCryptographicHash,
-    QCoreApplication,
     QEventLoop,
+    QObject,
 )
 from PyQt6.QtSql import QSql, QSqlDatabase, QSqlQuery
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,17 +7,16 @@
 Module implementing a dialog to configure safe browsing support.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QDateTime
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
+from PyQt6.QtCore import QDateTime, Qt, QUrl, pyqtSlot
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox

+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor

 from .Ui_SafeBrowsingDialog import Ui_SafeBrowsingDialog

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class SafeBrowsingDialog(QDialog, Ui_SafeBrowsingDialog):
     """
@@ -78,6 +77,7 @@
         """
         if self.__gsbHelpDialog is None:
             from eric7.EricWidgets.EricSimpleHelpDialog import EricSimpleHelpDialog
+
             from . import SafeBrowsingHelp

             helpStr = SafeBrowsingHelp()
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingInfoWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing a widget to show some threat information.
 """

-from PyQt6.QtCore import Qt, QPoint
-from PyQt6.QtWidgets import QMenu, QLabel, QHBoxLayout, QSizePolicy
+from PyQt6.QtCore import QPoint, Qt
+from PyQt6.QtWidgets import QHBoxLayout, QLabel, QMenu, QSizePolicy

 from eric7.EricGui import EricPixmapCache
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingLabel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing the label to show some SSL info.
 """

-from PyQt6.QtCore import Qt, pyqtSlot, pyqtSignal, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSignal, pyqtSlot
 from PyQt6.QtWidgets import QLabel
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -14,27 +14,26 @@
 # https://github.com/afilipovich/gglsbl
 #

+import base64
 import os
-import base64

 from PyQt6.QtCore import (
+    QCoreApplication,
+    QDateTime,
+    QObject,
+    QTimer,
+    QUrl,
     pyqtSignal,
     pyqtSlot,
-    QObject,
-    QCoreApplication,
-    QUrl,
-    QDateTime,
-    QTimer,
 )

 from eric7 import Preferences, Utilities
-
 from eric7.EricGui import EricPixmapCache
 from eric7.UI.NotificationWidget import NotificationTypes

 from .SafeBrowsingAPIClient import SafeBrowsingAPIClient
 from .SafeBrowsingCache import SafeBrowsingCache
-from .SafeBrowsingThreatList import ThreatList, HashPrefixList
+from .SafeBrowsingThreatList import HashPrefixList, ThreatList
 from .SafeBrowsingUrl import SafeBrowsingUrl


@@ -371,6 +370,7 @@
         """
         if self.__gsbDialog is None:
             from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
             from .SafeBrowsingDialog import SafeBrowsingDialog

             self.__gsbDialog = SafeBrowsingDialog(
--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingUrl.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingUrl.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing an URL representation suitable for Google Safe Browsing.
 """

+import contextlib
+import hashlib
+import posixpath
 import re
-import posixpath
 import socket
 import struct
-import hashlib
 import urllib.parse
-import contextlib

 from eric7 import Preferences
--- a/src/eric7/WebBrowser/SearchWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SearchWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing the search bar for the web browser.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QPalette
 from PyQt6.QtWidgets import QWidget

-from .Ui_SearchWidget import Ui_SearchWidget
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_SearchWidget import Ui_SearchWidget


 class SearchWidget(QWidget, Ui_SearchWidget):
--- a/src/eric7/WebBrowser/Session/SessionManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Session/SessionManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,40 +7,39 @@
 Module implementing the session manager.
 """

-import os
+import contextlib
+import functools
 import json
-import functools
-import contextlib
+import os
 import pathlib
 import shutil

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
-    Qt,
-    QObject,
-    QTimer,
+    QByteArray,
+    QDateTime,
     QDir,
     QFileSystemWatcher,
-    QByteArray,
-    QDateTime,
+    QObject,
+    Qt,
+    QTimer,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QActionGroup
 from PyQt6.QtWidgets import (
     QApplication,
-    QInputDialog,
-    QLineEdit,
+    QComboBox,
     QDialog,
     QDialogButtonBox,
+    QInputDialog,
     QLabel,
-    QComboBox,
+    QLineEdit,
     QVBoxLayout,
 )

-from eric7.EricWidgets import EricMessageBox
+from eric7 import Preferences, Utilities
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from eric7 import Preferences, Utilities
+from eric7.EricWidgets import EricMessageBox


 class SessionMetaData:
@@ -697,6 +696,7 @@
         Public method to show the session manager dialog.
         """
         from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
         from .SessionManagerDialog import SessionManagerDialog

         dlg = SessionManagerDialog(WebBrowserWindow.getWindow())
--- a/src/eric7/WebBrowser/Session/SessionManagerDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Session/SessionManagerDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,13 @@
 import datetime
 import pathlib

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QPalette
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

-from .Ui_SessionManagerDialog import Ui_SessionManagerDialog
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+from .Ui_SessionManagerDialog import Ui_SessionManagerDialog


 class SessionManagerDialog(QDialog, Ui_SessionManagerDialog):
--- a/src/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SiteInfo/SiteInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,16 +7,16 @@
 Module implementing a dialog to show some information about a site.
 """

-from PyQt6.QtCore import pyqtSlot, QUrl, Qt
-from PyQt6.QtGui import QPixmap, QImage, QPainter, QColor, QBrush
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
+from PyQt6.QtCore import Qt, QUrl, pyqtSlot
+from PyQt6.QtGui import QBrush, QColor, QImage, QPainter, QPixmap
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import (
+    QApplication,
     QDialog,
-    QTreeWidgetItem,
+    QGraphicsPixmapItem,
     QGraphicsScene,
     QMenu,
-    QApplication,
-    QGraphicsPixmapItem,
+    QTreeWidgetItem,
 )

 try:
@@ -26,17 +26,14 @@
 except ImportError:
     SSL = False

-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-
-from .Ui_SiteInfoDialog import Ui_SiteInfoDialog
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from ..Tools import Scripts, WebBrowserTools
 from ..WebBrowserPage import WebBrowserPage
-
-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-
-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+from .Ui_SiteInfoDialog import Ui_SiteInfoDialog


 class SiteInfoDialog(QDialog, Ui_SiteInfoDialog):
--- a/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SiteInfo/SiteInfoWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,20 +7,19 @@
 Module implementing a widget to show some site information.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import (
-    QMenu,
+    QFrame,
     QGridLayout,
     QHBoxLayout,
     QLabel,
-    QFrame,
+    QMenu,
+    QPushButton,
     QSizePolicy,
-    QPushButton,
     QSpacerItem,
 )

 from eric7.EricGui import EricPixmapCache
-
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/SpeedDial/PageThumbnailer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SpeedDial/PageThumbnailer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing an object to create a thumbnail image of a web site.
 """

-from PyQt6.QtCore import pyqtSignal, QObject, QSize, Qt, QUrl, QTimer
-from PyQt6.QtGui import QPixmap, QImage, QPainter
+from PyQt6.QtCore import QObject, QSize, Qt, QTimer, QUrl, pyqtSignal
+from PyQt6.QtGui import QImage, QPainter, QPixmap
 from PyQt6.QtWebEngineWidgets import QWebEngineView
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDial.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SpeedDial/SpeedDial.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,22 +10,21 @@
 import os

 from PyQt6.QtCore import (
+    QByteArray,
+    QCryptographicHash,
+    QObject,
+    QUrl,
     pyqtSignal,
     pyqtSlot,
-    QObject,
-    QCryptographicHash,
-    QByteArray,
-    QUrl,
     qWarning,
 )

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
+from eric7.Utilities.AutoSaver import AutoSaver

 from ..Tools.WebBrowserTools import pixmapFileToDataUrl

-from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Utilities
-

 class SpeedDial(QObject):
     """
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SpeedDial/SpeedDialReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 Module implementing a class to read speed dial data files.
 """

-from PyQt6.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QFile, QIODevice, QXmlStreamReader


 class SpeedDialReader(QXmlStreamReader):
--- a/src/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SpeedDial/SpeedDialWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write speed dial data files.
 """

-from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QFile, QIODevice, QXmlStreamWriter


 class SpeedDialWriter(QXmlStreamWriter):
--- a/src/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/SpellCheck/ManageDictionariesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,25 +7,23 @@
 Module implementing a dialog to install spell checking dictionaries.
 """

-import os
+import contextlib
+import glob
 import io
-import zipfile
-import glob
+import os
 import shutil
-import contextlib
+import zipfile

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl
-from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton, QListWidgetItem
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkInformation
+from PyQt6.QtCore import Qt, QUrl, pyqtSlot
+from PyQt6.QtNetwork import QNetworkInformation, QNetworkReply, QNetworkRequest
+from PyQt6.QtWidgets import QAbstractButton, QDialog, QDialogButtonBox, QListWidgetItem

+from eric7 import Preferences
 from eric7.EricWidgets import EricMessageBox
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .Ui_ManageDictionariesDialog import Ui_ManageDictionariesDialog

-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
-from eric7 import Preferences
-

 class ManageDictionariesDialog(QDialog, Ui_ManageDictionariesDialog):
     """
--- a/src/eric7/WebBrowser/StatusBar/ImagesIcon.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/StatusBar/ImagesIcon.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,15 +12,15 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
+from PyQt6.QtWebEngineCore import QWebEngineSettings
 from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu
-from PyQt6.QtWebEngineCore import QWebEngineSettings
+
+from eric7 import Preferences
+from eric7.EricGui import EricPixmapCache

 from .StatusBarIcon import StatusBarIcon

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences
-

 class ImagesIcon(StatusBarIcon):
     """
--- a/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/StatusBar/JavaScriptIcon.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,14 +12,14 @@
 # Copyright (C) 2014  David Rosca <nowrep@gmail.com>
 #

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint, QTimer
-from PyQt6.QtWidgets import QGraphicsColorizeEffect, QMenu, QDialog
+from PyQt6.QtCore import QPoint, Qt, QTimer, pyqtSlot
 from PyQt6.QtWebEngineCore import QWebEngineSettings
+from PyQt6.QtWidgets import QDialog, QGraphicsColorizeEffect, QMenu
+
+from eric7.EricGui import EricPixmapCache

 from .StatusBarIcon import StatusBarIcon

-from eric7.EricGui import EricPixmapCache
-

 class JavaScriptIcon(StatusBarIcon):
     """
--- a/src/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/StatusBar/JavaScriptSettingsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_JavaScriptSettingsDialog import Ui_JavaScriptSettingsDialog
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_JavaScriptSettingsDialog import Ui_JavaScriptSettingsDialog


 class JavaScriptSettingsDialog(QDialog, Ui_JavaScriptSettingsDialog):
--- a/src/eric7/WebBrowser/Sync/DirectorySyncHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/DirectorySyncHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,14 +10,13 @@
 import os
 import pathlib

-from PyQt6.QtCore import pyqtSignal, QByteArray, QCoreApplication
+from PyQt6.QtCore import QByteArray, QCoreApplication, pyqtSignal
+
+from eric7 import Preferences
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .SyncHandler import SyncHandler

-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
-from eric7 import Preferences
-

 class DirectorySyncHandler(SyncHandler):
     """
--- a/src/eric7/WebBrowser/Sync/FtpSyncHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/FtpSyncHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,23 +7,20 @@
 Module implementing a synchronization handler using FTP.
 """

+import contextlib
 import ftplib  # secok
 import io
-import contextlib
 import pathlib

-from PyQt6.QtCore import pyqtSignal, QTimer, QCoreApplication, QByteArray
+from PyQt6.QtCore import QByteArray, QCoreApplication, QTimer, pyqtSignal

-from eric7.EricNetwork.EricFtp import EricFtp, EricFtpProxyType, EricFtpProxyError
+from eric7 import Preferences
+from eric7.EricNetwork.EricFtp import EricFtp, EricFtpProxyError, EricFtpProxyType
+from eric7.Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .SyncHandler import SyncHandler

-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-
-from eric7 import Preferences
-
-from eric7.Utilities.FtpUtilities import FtpDirLineParser, FtpDirLineParserError
-

 class FtpSyncHandler(SyncHandler):
     """
--- a/src/eric7/WebBrowser/Sync/SyncAssistantDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncAssistantDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtWidgets import QWizard

+from eric7 import Globals
 from eric7.EricGui import EricPixmapCache
-from eric7 import Globals


 class SyncAssistantDialog(QWizard):
@@ -27,13 +27,12 @@
         super().__init__(parent)

         from . import SyncGlobals
-
+        from .SyncCheckPage import SyncCheckPage
         from .SyncDataPage import SyncDataPage
+        from .SyncDirectorySettingsPage import SyncDirectorySettingsPage
         from .SyncEncryptionPage import SyncEncryptionPage
+        from .SyncFtpSettingsPage import SyncFtpSettingsPage
         from .SyncHostTypePage import SyncHostTypePage
-        from .SyncFtpSettingsPage import SyncFtpSettingsPage
-        from .SyncDirectorySettingsPage import SyncDirectorySettingsPage
-        from .SyncCheckPage import SyncCheckPage

         self.setPage(SyncGlobals.PageData, SyncDataPage(self))
         self.setPage(SyncGlobals.PageEncryption, SyncEncryptionPage(self))
--- a/src/eric7/WebBrowser/Sync/SyncCheckPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncCheckPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,13 +10,12 @@
 from PyQt6.QtCore import QTimer
 from PyQt6.QtWidgets import QWizardPage

-from . import SyncGlobals
-
-from .Ui_SyncCheckPage import Ui_SyncCheckPage
-
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache

+from . import SyncGlobals
+from .Ui_SyncCheckPage import Ui_SyncCheckPage
+

 class SyncCheckPage(QWizardPage, Ui_SyncCheckPage):
     """
--- a/src/eric7/WebBrowser/Sync/SyncDataPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncDataPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QWizardPage

-from .Ui_SyncDataPage import Ui_SyncDataPage
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_SyncDataPage import Ui_SyncDataPage


 class SyncDataPage(QWizardPage, Ui_SyncDataPage):
--- a/src/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncDirectorySettingsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QWizardPage

+from eric7 import Preferences
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes

 from .Ui_SyncDirectorySettingsPage import Ui_SyncDirectorySettingsPage

-from eric7 import Preferences
-

 class SyncDirectorySettingsPage(QWizardPage, Ui_SyncDirectorySettingsPage):
     """
--- a/src/eric7/WebBrowser/Sync/SyncEncryptionPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncEncryptionPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QWizardPage

-from .Ui_SyncEncryptionPage import Ui_SyncEncryptionPage
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_SyncEncryptionPage import Ui_SyncEncryptionPage


 class SyncEncryptionPage(QWizardPage, Ui_SyncEncryptionPage):
--- a/src/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncFtpSettingsPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QWizardPage

-from .Ui_SyncFtpSettingsPage import Ui_SyncFtpSettingsPage
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_SyncFtpSettingsPage import Ui_SyncFtpSettingsPage


 class SyncFtpSettingsPage(QWizardPage, Ui_SyncFtpSettingsPage):
--- a/src/eric7/WebBrowser/Sync/SyncHandler.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncHandler.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,11 +9,10 @@

 import os

-from PyQt6.QtCore import QObject, pyqtSignal, QByteArray
+from PyQt6.QtCore import QByteArray, QObject, pyqtSignal

 from eric7 import Preferences
-
-from eric7.Utilities.crypto import dataEncrypt, dataDecrypt
+from eric7.Utilities.crypto import dataDecrypt, dataEncrypt


 class SyncHandler(QObject):
--- a/src/eric7/WebBrowser/Sync/SyncHostTypePage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncHostTypePage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 from PyQt6.QtWidgets import QWizardPage

+from eric7 import Preferences
+
 from . import SyncGlobals
-
 from .Ui_SyncHostTypePage import Ui_SyncHostTypePage

-from eric7 import Preferences
-

 class SyncHostTypePage(QWizardPage, Ui_SyncHostTypePage):
     """
--- a/src/eric7/WebBrowser/Sync/SyncManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Sync/SyncManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,7 +12,6 @@
 from PyQt6.QtCore import QObject, pyqtSignal

 from eric7 import Preferences
-
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/TabManager/TabManagerWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/TabManager/TabManagerWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,27 +12,25 @@
 # Copyright (C) 2013  S. Razi Alavizadeh <s.r.alavizadeh@gmail.com>
 #

+import collections
 import os
-import collections

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QTimer, QRect
+from PyQt6.QtCore import QPoint, QRect, Qt, QTimer, pyqtSignal, pyqtSlot
 from PyQt6.QtGui import QAction
 from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QTreeWidget,
-    QTreeWidgetItem,
     QMenu,
     QStyle,
+    QTreeWidget,
+    QTreeWidgetItem,
+    QVBoxLayout,
+    QWidget,
 )

-from eric7.EricNetwork import EricTldExtractor, EricNetworkUtilities
-
-from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets.EricClickableLabel import EricClickableLabel
-
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricNetwork import EricNetworkUtilities, EricTldExtractor
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets.EricClickableLabel import EricClickableLabel


 class TabManagerWidget(QWidget):
@@ -126,8 +124,8 @@
         if not browsersDict:
             return

+        from ..Bookmarks.AddBookmarkDialog import AddBookmarkDialog
         from ..Bookmarks.BookmarkNode import BookmarkNode
-        from ..Bookmarks.AddBookmarkDialog import AddBookmarkDialog

         dlg = AddBookmarkDialog()
         dlg.setFolder(True)
--- a/src/eric7/WebBrowser/Tools/DelayedFileWatcher.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/DelayedFileWatcher.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a file system watcher with a delay.
 """

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QFileSystemWatcher, QTimer
+from PyQt6.QtCore import QFileSystemWatcher, QTimer, pyqtSignal, pyqtSlot


 class DelayedFileWatcher(QFileSystemWatcher):
--- a/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/PrintToPdfDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 import os

-from PyQt6.QtCore import pyqtSlot, QMarginsF, QStandardPaths
+from PyQt6.QtCore import QMarginsF, QStandardPaths, pyqtSlot
 from PyQt6.QtGui import QPageLayout, QPageSize
-from PyQt6.QtPrintSupport import QPrinter, QPageSetupDialog
+from PyQt6.QtPrintSupport import QPageSetupDialog, QPrinter
 from PyQt6.QtWidgets import QDialog

 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
--- a/src/eric7/WebBrowser/Tools/Scripts.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/Scripts.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,7 +12,7 @@
 # Copyright (C) David Rosca <nowrep@gmail.com>
 #

-from PyQt6.QtCore import QUrlQuery, QUrl
+from PyQt6.QtCore import QUrl, QUrlQuery

 from .WebBrowserTools import getJavascript
--- a/src/eric7/WebBrowser/Tools/WebBrowserTools.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/WebBrowserTools.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,14 +7,13 @@
 Module implementing tool functions for the web browser.
 """

+import mimetypes
 import os
 import re
-import mimetypes

-from PyQt6.QtCore import QByteArray, QUrl, QCoreApplication, QBuffer, QIODevice
+from PyQt6.QtCore import QBuffer, QByteArray, QCoreApplication, QIODevice, QUrl
 from PyQt6.QtGui import QPixmap

-
 WebBrowserDataDirectory = {
     "html": os.path.join(os.path.dirname(__file__), "..", "data", "html"),
     "icons": os.path.join(os.path.dirname(__file__), "..", "data", "icons"),
@@ -220,9 +219,9 @@
     """
     try:
         from PyQt6.QtWebEngineCore import (
-            qWebEngineVersion,
+            qWebEngineChromiumSecurityPatchVersion,
             qWebEngineChromiumVersion,
-            qWebEngineChromiumSecurityPatchVersion,
+            qWebEngineVersion,
         )

         chromiumVersion = qWebEngineChromiumVersion()
--- a/src/eric7/WebBrowser/Tools/WebIconDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/WebIconDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a dialog to manage the Favicons.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QPoint
+from PyQt6.QtCore import QPoint, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QListWidgetItem, QMenu

 from .Ui_WebIconDialog import Ui_WebIconDialog
--- a/src/eric7/WebBrowser/Tools/WebIconLoader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/WebIconLoader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module implementing an object to load web site icons.
 """

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject
-from PyQt6.QtGui import QIcon, QPixmap, QImage
+from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QIcon, QImage, QPixmap
 from PyQt6.QtNetwork import QNetworkRequest, QSslConfiguration

 try:
--- a/src/eric7/WebBrowser/Tools/WebIconProvider.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/Tools/WebIconProvider.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,18 +7,17 @@
 Module containing a web site icon storage object.
 """

+import contextlib
 import json
 import os
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject, QByteArray, QBuffer, QIODevice, QUrl
-from PyQt6.QtGui import QIcon, QPixmap, QImage
+from PyQt6.QtCore import QBuffer, QByteArray, QIODevice, QObject, QUrl, pyqtSignal
+from PyQt6.QtGui import QIcon, QImage, QPixmap
 from PyQt6.QtWidgets import QDialog

+from eric7.EricGui import EricPixmapCache
 from eric7.Utilities.AutoSaver import AutoSaver

-from eric7.EricGui import EricPixmapCache
-

 class WebIconProvider(QObject):
     """
--- a/src/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UrlBar/BookmarkActionSelectionDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_BookmarkActionSelectionDialog import Ui_BookmarkActionSelectionDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_BookmarkActionSelectionDialog import Ui_BookmarkActionSelectionDialog


 class BookmarkActionSelectionDialog(QDialog, Ui_BookmarkActionSelectionDialog):
--- a/src/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UrlBar/BookmarkInfoDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,9 +11,9 @@
 from PyQt6.QtGui import QFont
 from PyQt6.QtWidgets import QDialog

-from .Ui_BookmarkInfoDialog import Ui_BookmarkInfoDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_BookmarkInfoDialog import Ui_BookmarkInfoDialog


 class BookmarkInfoDialog(QDialog, Ui_BookmarkInfoDialog):
--- a/src/eric7/WebBrowser/UrlBar/FavIconLabel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UrlBar/FavIconLabel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,9 +7,9 @@
 Module implementing the label to show the web site icon.
 """

-from PyQt6.QtCore import Qt, QPoint, QMimeData
+from PyQt6.QtCore import QMimeData, QPoint, Qt
 from PyQt6.QtGui import QDrag, QPixmap
-from PyQt6.QtWidgets import QLabel, QApplication
+from PyQt6.QtWidgets import QApplication, QLabel


 class FavIconLabel(QLabel):
--- a/src/eric7/WebBrowser/UrlBar/StackedUrlBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UrlBar/StackedUrlBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a widget to stack url bars.
 """

-from PyQt6.QtWidgets import QStackedWidget, QSizePolicy
+from PyQt6.QtWidgets import QSizePolicy, QStackedWidget


 class StackedUrlBar(QStackedWidget):
--- a/src/eric7/WebBrowser/UrlBar/UrlBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UrlBar/UrlBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,28 +7,25 @@
 Module implementing the URL bar widget.
 """

-from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QDateTime, QTimer, QPoint
-from PyQt6.QtGui import QColor, QPalette, QIcon
-from PyQt6.QtWidgets import QDialog, QApplication, QLineEdit
+from PyQt6.QtCore import QDateTime, QPoint, Qt, QTimer, QUrl, pyqtSlot
+from PyQt6.QtGui import QColor, QIcon, QPalette
 from PyQt6.QtWebEngineCore import QWebEnginePage
+from PyQt6.QtWidgets import QApplication, QDialog, QLineEdit

 try:
     from PyQt6.QtNetwork import QSslCertificate  # __IGNORE_EXCEPTION__
 except ImportError:
     QSslCertificate = None  # __IGNORE_WARNING__

+from eric7 import Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricLineEdit import EricClearableLineEdit, EricLineEditSide
-
+from eric7.WebBrowser.SafeBrowsing.SafeBrowsingLabel import SafeBrowsingLabel
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

-from eric7.WebBrowser.SafeBrowsing.SafeBrowsingLabel import SafeBrowsingLabel
-
 from .FavIconLabel import FavIconLabel
 from .SslLabel import SslLabel

-from eric7.EricGui import EricPixmapCache
-from eric7 import Preferences, Utilities
-

 class UrlBar(EricClearableLineEdit):
     """
--- a/src/eric7/WebBrowser/UserAgent/UserAgentManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,12 +9,11 @@

 import os

-from PyQt6.QtCore import pyqtSignal, QObject, QXmlStreamReader
+from PyQt6.QtCore import QObject, QXmlStreamReader, pyqtSignal

+from eric7 import Utilities
 from eric7.EricWidgets import EricMessageBox
-
 from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Utilities


 class UserAgentManager(QObject):
--- a/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentMenu.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a menu to select the user agent string.
 """

+import functools
 import os
-import functools

-from PyQt6.QtCore import QXmlStreamReader, QFile, QIODevice
+from PyQt6.QtCore import QFile, QIODevice, QXmlStreamReader
 from PyQt6.QtGui import QAction, QActionGroup
-from PyQt6.QtWidgets import QMenu, QInputDialog, QLineEdit
+from PyQt6.QtWidgets import QInputDialog, QLineEdit, QMenu

 from eric7.EricWidgets import EricMessageBox
--- a/src/eric7/WebBrowser/UserAgent/UserAgentModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt


 class UserAgentModel(QAbstractTableModel):
--- a/src/eric7/WebBrowser/UserAgent/UserAgentReader.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentReader.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 Module implementing a class to read user agent data files.
 """

-from PyQt6.QtCore import QXmlStreamReader, QIODevice, QFile, QCoreApplication
+from PyQt6.QtCore import QCoreApplication, QFile, QIODevice, QXmlStreamReader


 class UserAgentReader(QXmlStreamReader):
--- a/src/eric7/WebBrowser/UserAgent/UserAgentWriter.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentWriter.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a class to write user agent data files.
 """

-from PyQt6.QtCore import QXmlStreamWriter, QIODevice, QFile
+from PyQt6.QtCore import QFile, QIODevice, QXmlStreamWriter


 class UserAgentWriter(QXmlStreamWriter):
--- a/src/eric7/WebBrowser/UserAgent/UserAgentsDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentsDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -13,10 +13,9 @@

 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

+from .Ui_UserAgentsDialog import Ui_UserAgentsDialog
 from .UserAgentModel import UserAgentModel

-from .Ui_UserAgentsDialog import Ui_UserAgentsDialog
-

 class UserAgentsDialog(QDialog, Ui_UserAgentsDialog):
     """
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalApi.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalApi.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,11 @@
 import contextlib
 import json

-from PyQt6.QtCore import pyqtSignal, QObject, QUrl, QUrlQuery, QByteArray
-from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply
-
-from eric7.EricWidgets import EricMessageBox
+from PyQt6.QtCore import QByteArray, QObject, QUrl, QUrlQuery, pyqtSignal
+from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest

 from eric7 import Preferences
-
+from eric7.EricWidgets import EricMessageBox
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to show the VirusTotal domain report.
 """

-from PyQt6.QtCore import pyqtSlot, Qt
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

-from .Ui_VirusTotalDomainReportDialog import Ui_VirusTotalDomainReportDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_VirusTotalDomainReportDialog import Ui_VirusTotalDomainReportDialog


 class VirusTotalDomainReportDialog(QDialog, Ui_VirusTotalDomainReportDialog):
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalIpReportDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,9 +10,9 @@
 from PyQt6.QtCore import Qt
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem

-from .Ui_VirusTotalIpReportDialog import Ui_VirusTotalIpReportDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_VirusTotalIpReportDialog import Ui_VirusTotalIpReportDialog


 class VirusTotalIpReportDialog(QDialog, Ui_VirusTotalIpReportDialog):
--- a/src/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/VirusTotal/VirusTotalWhoisDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,9 +9,9 @@

 from PyQt6.QtWidgets import QDialog

-from .Ui_VirusTotalWhoisDialog import Ui_VirusTotalWhoisDialog
+from eric7.EricGui import EricPixmapCache

-from eric7.EricGui import EricPixmapCache
+from .Ui_VirusTotalWhoisDialog import Ui_VirusTotalWhoisDialog


 class VirusTotalWhoisDialog(QDialog, Ui_VirusTotalWhoisDialog):
--- a/src/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserJavaScriptConsole.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,8 +9,8 @@

 from PyQt6.QtCore import Qt
 from PyQt6.QtGui import QTextCursor
-from PyQt6.QtWidgets import QTextEdit, QMenu
 from PyQt6.QtWebEngineCore import QWebEnginePage
+from PyQt6.QtWidgets import QMenu, QTextEdit


 class WebBrowserJavaScriptConsole(QTextEdit):
--- a/src/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserLanguagesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,12 +7,12 @@
 Module implementing a dialog to configure the preferred languages.
 """

-from PyQt6.QtCore import pyqtSlot, QLocale, QStringListModel
+from PyQt6.QtCore import QLocale, QStringListModel, pyqtSlot
 from PyQt6.QtWidgets import QDialog

-from .Ui_WebBrowserLanguagesDialog import Ui_WebBrowserLanguagesDialog
+from eric7 import Preferences

-from eric7 import Preferences
+from .Ui_WebBrowserLanguagesDialog import Ui_WebBrowserLanguagesDialog


 class WebBrowserLanguagesDialog(QDialog, Ui_WebBrowserLanguagesDialog):
--- a/src/eric7/WebBrowser/WebBrowserPage.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserPage.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,35 +9,32 @@
 """

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
-    QUrl,
-    QUrlQuery,
-    QTimer,
     QEventLoop,
     QPoint,
+    QTimer,
+    QUrl,
+    QUrlQuery,
+    pyqtSignal,
+    pyqtSlot,
 )
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings, QWebEngineScript
 from PyQt6.QtWebChannel import QWebChannel
+from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineScript, QWebEngineSettings

 try:
-    from PyQt6.QtNetwork import QSslConfiguration, QSslCertificate
+    from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration

     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False

+from eric7 import Globals, Preferences
 from eric7.EricWidgets import EricMessageBox
-
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

 from .JavaScript.ExternalJsObject import ExternalJsObject
-
+from .Tools import Scripts
 from .Tools.WebHitTestResult import WebHitTestResult
-from .Tools import Scripts
-
-from eric7 import Globals, Preferences


 class WebBrowserPage(QWebEnginePage):
--- a/src/eric7/WebBrowser/WebBrowserSingleApplication.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserSingleApplication.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,13 +11,12 @@

 from PyQt6.QtCore import pyqtSignal

+from eric7 import Globals
 from eric7.Toolbox.SingleApplication import (
     SingleApplicationClient,
     SingleApplicationServer,
 )

-from eric7 import Globals
-
 ###########################################################################
 ## define some module global stuff
 ###########################################################################
--- a/src/eric7/WebBrowser/WebBrowserSnap.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserSnap.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,7 +8,7 @@
 """

 from PyQt6.QtCore import Qt
-from PyQt6.QtGui import QPixmap, QPainter
+from PyQt6.QtGui import QPainter, QPixmap


 def renderTabPreview(view, w, h):
--- a/src/eric7/WebBrowser/WebBrowserTabBar.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserTabBar.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,12 @@
 Module implementing a specialized tab bar for the web browser.
 """

-from PyQt6.QtCore import Qt, QPoint, QTimer, QEvent
+from PyQt6.QtCore import QEvent, QPoint, Qt, QTimer
 from PyQt6.QtWidgets import QLabel

-from eric7.EricWidgets.EricTabWidget import EricWheelTabBar
+from eric7 import Preferences
 from eric7.EricWidgets.EricPassivePopup import EricPassivePopup, EricPassivePopupStyle
-
-from eric7 import Preferences
+from eric7.EricWidgets.EricTabWidget import EricWheelTabBar


 class WebBrowserTabBar(EricWheelTabBar):
--- a/src/eric7/WebBrowser/WebBrowserTabWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserTabWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,24 +9,22 @@

 import os

-from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QUrl, QMarginsF
-from PyQt6.QtGui import QIcon, QPixmap, QPainter, QPageLayout
-from PyQt6.QtWidgets import QWidget, QHBoxLayout, QMenu, QToolButton, QDialog
-from PyQt6.QtPrintSupport import QPrinter, QPrintDialog, QAbstractPrintDialog
+from PyQt6.QtCore import QMarginsF, Qt, QUrl, pyqtSignal, pyqtSlot
+from PyQt6.QtGui import QIcon, QPageLayout, QPainter, QPixmap
+from PyQt6.QtPrintSupport import QAbstractPrintDialog, QPrintDialog, QPrinter
+from PyQt6.QtWidgets import QDialog, QHBoxLayout, QMenu, QToolButton, QWidget

-from eric7.EricWidgets.EricTabWidget import EricTabWidget
+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
+from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
+from eric7.EricWidgets.EricTabWidget import EricTabWidget

-from .WebBrowserView import WebBrowserView
-from .WebBrowserPage import WebBrowserPage
+from . import WebInspector
 from .Tools import WebBrowserTools
-from . import WebInspector
-
-from eric7.EricGui import EricPixmapCache
-
-from eric7 import Globals, Preferences, Utilities
+from .WebBrowserPage import WebBrowserPage
+from .WebBrowserView import WebBrowserView


 def isCupsAvailable():
@@ -415,9 +413,10 @@
         urlbar = UrlBar(self.__mainWindow, self)
         if self.__historyCompleter is None:
             from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
             from .History.HistoryCompleter import (
+                HistoryCompleter,
                 HistoryCompletionModel,
-                HistoryCompleter,
             )

             histMgr = WebBrowserWindow.historyManager()
--- a/src/eric7/WebBrowser/WebBrowserView.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserView.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,54 +8,50 @@
 Module implementing the web browser using QWebEngineView.
 """

-import os
+import contextlib
 import functools
-import contextlib
+import os
 import pathlib

 from PyQt6.QtCore import (
+    QByteArray,
+    QDataStream,
+    QDateTime,
+    QEvent,
+    QIODevice,
+    QPoint,
+    QPointF,
+    QStandardPaths,
+    Qt,
+    QTimer,
+    QUrl,
     pyqtSignal,
     pyqtSlot,
-    Qt,
-    QUrl,
-    QTimer,
-    QEvent,
-    QPoint,
-    QPointF,
-    QDateTime,
-    QStandardPaths,
-    QByteArray,
-    QIODevice,
-    QDataStream,
 )
 from PyQt6.QtGui import (
+    QClipboard,
+    QContextMenuEvent,
+    QCursor,
     QDesktopServices,
-    QClipboard,
     QIcon,
-    QContextMenuEvent,
     QPixmap,
-    QCursor,
 )
-from PyQt6.QtWidgets import QStyle, QMenu, QApplication, QDialog
-from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineDownloadRequest
+from PyQt6.QtWebEngineCore import QWebEngineDownloadRequest, QWebEnginePage
 from PyQt6.QtWebEngineWidgets import QWebEngineView
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.EricWidgets.EricApplication import ericApp
-
-from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
-from .WebBrowserPage import WebBrowserPage
-
-from .Tools.WebIconLoader import WebIconLoader
-from .Tools import Scripts
-
-from . import WebInspector
-from .Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
+from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QStyle

 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
+from eric7.Globals import qVersionTuple
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow

-from eric7.Globals import qVersionTuple
+from . import WebInspector
+from .Tools import Scripts
+from .Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
+from .Tools.WebIconLoader import WebIconLoader
+from .WebBrowserPage import WebBrowserPage


 class WebBrowserView(QWebEngineView):
@@ -1897,6 +1893,7 @@
         modified = QDateTime.fromString(lastModified, "MM/dd/yyyy hh:mm:ss")
         if modified.isValid():
             from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
+
             from .Bookmarks.BookmarkNode import BookmarkNode

             manager = WebBrowserWindow.bookmarksManager()
--- a/src/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserWebSearchWidget.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,15 +7,13 @@
 Module implementing a web search widget for the web browser.
 """

-from PyQt6.QtCore import pyqtSignal, QUrl, QModelIndex, QTimer, Qt
-from PyQt6.QtGui import QStandardItem, QStandardItemModel, QFont, QIcon, QPixmap
-from PyQt6.QtWidgets import QMenu, QCompleter
+from PyQt6.QtCore import QModelIndex, Qt, QTimer, QUrl, pyqtSignal
+from PyQt6.QtGui import QFont, QIcon, QPixmap, QStandardItem, QStandardItemModel
 from PyQt6.QtWebEngineCore import QWebEnginePage
-
-from eric7.EricGui import EricPixmapCache
+from PyQt6.QtWidgets import QCompleter, QMenu

 from eric7 import Preferences
-
+from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricLineEdit import EricClearableLineEdit, EricLineEditSide

 from .WebBrowserPage import WebBrowserPage
@@ -42,6 +40,7 @@
         super().__init__(parent)

         from eric7.EricWidgets.EricLineEditButton import EricLineEditButton
+
         from .OpenSearch.OpenSearchManager import OpenSearchManager

         self.__mw = mainWindow
--- a/src/eric7/WebBrowser/WebBrowserWindow.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,45 +7,45 @@
 Module implementing the web browser main window.
 """

-import os
-import shutil
+import contextlib
 import functools
-import contextlib
+import os
 import pathlib
+import shutil

 from PyQt6.QtCore import (
-    pyqtSlot,
-    pyqtSignal,
+    QByteArray,
+    QEvent,
+    QProcess,
+    QSize,
     Qt,
-    QByteArray,
-    QSize,
     QTimer,
     QUrl,
-    QProcess,
-    QEvent,
+    pyqtSignal,
+    pyqtSlot,
 )
-from PyQt6.QtGui import QDesktopServices, QKeySequence, QAction, QFont, QFontMetrics
-from PyQt6.QtWidgets import (
-    QWidget,
-    QVBoxLayout,
-    QSizePolicy,
-    QDockWidget,
-    QComboBox,
-    QLabel,
-    QMenu,
-    QLineEdit,
-    QApplication,
-    QWhatsThis,
-    QDialog,
-    QHBoxLayout,
-    QProgressBar,
-    QInputDialog,
-)
+from PyQt6.QtGui import QAction, QDesktopServices, QFont, QFontMetrics, QKeySequence
 from PyQt6.QtWebEngineCore import (
-    QWebEngineSettings,
     QWebEnginePage,
     QWebEngineProfile,
     QWebEngineScript,
+    QWebEngineSettings,
+)
+from PyQt6.QtWidgets import (
+    QApplication,
+    QComboBox,
+    QDialog,
+    QDockWidget,
+    QHBoxLayout,
+    QInputDialog,
+    QLabel,
+    QLineEdit,
+    QMenu,
+    QProgressBar,
+    QSizePolicy,
+    QVBoxLayout,
+    QWhatsThis,
+    QWidget,
 )

 try:
@@ -55,34 +55,26 @@
 except ImportError:
     QTHELP_AVAILABLE = False

+from eric7 import Globals, Preferences, Utilities
+from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
-
-from eric7.EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage
+from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
+from eric7.EricWidgets import EricErrorMessage, EricFileDialog, EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricMainWindow import EricMainWindow
-from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricZoomWidget import EricZoomWidget
-
-from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon
-
-from eric7 import Globals, Preferences, Utilities
-
+from eric7.Globals import getConfig
 from eric7.Preferences import Shortcuts
-
-from eric7.EricGui import EricPixmapCache
 from eric7.UI import Config
 from eric7.UI.Info import Version
 from eric7.UI.NotificationWidget import NotificationTypes
+from eric7.WebBrowser.Tools import WebIconProvider
+from eric7.WebBrowser.ZoomManager import ZoomManager

 from .Tools import Scripts, WebBrowserTools
-from eric7.WebBrowser.Tools import WebIconProvider
-
-from eric7.WebBrowser.ZoomManager import ZoomManager
-
 from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer

-from eric7.Globals import getConfig
-

 class WebBrowserWindow(EricMainWindow):
     """
@@ -204,19 +196,19 @@
         self.__windowStates = Qt.WindowState.WindowNoState
         self.__isClosing = False

-        from .SearchWidget import SearchWidget
-        from .QtHelp.HelpTocWidget import HelpTocWidget
+        from .AdBlock.AdBlockIcon import AdBlockIcon
+        from .Bookmarks.BookmarksToolBar import BookmarksToolBar
+        from .Navigation.NavigationBar import NavigationBar
+        from .Navigation.NavigationContainer import NavigationContainer
         from .QtHelp.HelpIndexWidget import HelpIndexWidget
         from .QtHelp.HelpSearchWidget import HelpSearchWidget
-        from .WebBrowserView import WebBrowserView
-        from .WebBrowserTabWidget import WebBrowserTabWidget
-        from .AdBlock.AdBlockIcon import AdBlockIcon
-        from .StatusBar.JavaScriptIcon import JavaScriptIcon
+        from .QtHelp.HelpTocWidget import HelpTocWidget
+        from .SearchWidget import SearchWidget
         from .StatusBar.ImagesIcon import ImagesIcon
+        from .StatusBar.JavaScriptIcon import JavaScriptIcon
         from .VirusTotal.VirusTotalApi import VirusTotalAPI
-        from .Navigation.NavigationBar import NavigationBar
-        from .Navigation.NavigationContainer import NavigationContainer
-        from .Bookmarks.BookmarksToolBar import BookmarksToolBar
+        from .WebBrowserTabWidget import WebBrowserTabWidget
+        from .WebBrowserView import WebBrowserView

         self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet"))

@@ -3119,8 +3111,8 @@
         """
         Public slot to bookmark all open tabs.
         """
+        from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
         from .WebBrowserPage import WebBrowserPage
-        from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog

         dlg = AddBookmarkDialog()
         dlg.setFolder(True)
--- a/src/eric7/WebBrowser/WebInspector.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/WebInspector.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,7 +7,7 @@
 Module implementing a QWebEngineView to load the web inspector in.
 """

-from PyQt6.QtCore import pyqtSignal, QSize
+from PyQt6.QtCore import QSize, pyqtSignal
 from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineSettings
 from PyQt6.QtWebEngineWidgets import QWebEngineView
--- a/src/eric7/WebBrowser/ZoomManager/ZoomManager.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/ZoomManager/ZoomManager.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,13 +7,13 @@
 Module implementing a manager for site specific zoom level settings.
 """

+import contextlib
 import json
-import contextlib

-from PyQt6.QtCore import pyqtSignal, QObject
+from PyQt6.QtCore import QObject, pyqtSignal

+from eric7 import Preferences
 from eric7.Utilities.AutoSaver import AutoSaver
-from eric7 import Preferences


 class ZoomManager(QObject):
--- a/src/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/ZoomManager/ZoomValuesDialog.py	Fri Nov 04 13:52:26 2022 +0100
@@ -32,6 +32,7 @@
         self.removeAllButton.clicked.connect(self.zoomValuesTable.removeAll)

         from eric7.WebBrowser.ZoomManager import ZoomManager
+
         from .ZoomValuesModel import ZoomValuesModel

         self.zoomValuesTable.verticalHeader().hide()
--- a/src/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/WebBrowser/ZoomManager/ZoomValuesModel.py	Fri Nov 04 13:52:26 2022 +0100
@@ -9,7 +9,7 @@

 import contextlib

-from PyQt6.QtCore import Qt, QModelIndex, QAbstractTableModel
+from PyQt6.QtCore import QAbstractTableModel, QModelIndex, Qt


 class ZoomValuesModel(QAbstractTableModel):
--- a/src/eric7/eric7_api.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_api.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,15 +12,15 @@
 This script can be used via the commandline as well.
 """

+import fnmatch
+import glob
 import os
 import sys
-import glob
-import fnmatch

-from eric7.Utilities import ModuleParser
+from eric7 import DocumentationTools, Utilities
 from eric7.DocumentationTools.APIGenerator import APIGenerator
 from eric7.UI.Info import Version
-from eric7 import DocumentationTools, Utilities
+from eric7.Utilities import ModuleParser


 def usage():
--- a/src/eric7/eric7_browser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_browser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 of the integrated web browser. It is based on QtWebEngine.
 """

+import os
 import sys
-import os

 app = None
 SettingsDir = None
@@ -43,6 +43,7 @@
     if "--quiet" not in sys.argv:
         from PyQt6.QtCore import QTimer
         from PyQt6.QtWidgets import QApplication
+
         from eric7.EricWidgets import EricMessageBox  # __IGNORE_WARNING__

         app = QApplication([])
@@ -60,12 +61,9 @@

 from PyQt6.QtWebEngineCore import QWebEngineUrlScheme

+from eric7.EricWidgets.EricApplication import EricApplication
 from eric7.Globals import AppInfo
-
-from eric7.EricWidgets.EricApplication import EricApplication
-
 from eric7.Toolbox import Startup
-
 from eric7.WebBrowser.WebBrowserSingleApplication import (
     WebBrowserSingleApplicationClient,
 )
--- a/src/eric7/eric7_compare.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_compare.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 version of the integrated Compare module.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_configure.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_configure.py	Fri Nov 04 13:52:26 2022 +0100
@@ -10,8 +10,8 @@
 This is the main Python script to configure the eric IDE from the outside.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -32,7 +32,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_diff.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_diff.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 version of the integrated Diff module.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_doc.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_doc.py	Fri Nov 04 13:52:26 2022 +0100
@@ -18,16 +18,14 @@
 import shutil
 import sys

-from eric7.Utilities import ModuleParser
-
+from eric7 import Utilities
+from eric7.DocumentationTools import TemplatesListsStyleCSS
+from eric7.DocumentationTools.Config import eric7docDefaultColors
+from eric7.DocumentationTools.IndexGenerator import IndexGenerator
 from eric7.DocumentationTools.ModuleDocumentor import ModuleDocument
-from eric7.DocumentationTools.IndexGenerator import IndexGenerator
 from eric7.DocumentationTools.QtHelpGenerator import QtHelpGenerator
-from eric7.DocumentationTools.Config import eric7docDefaultColors
-from eric7.DocumentationTools import TemplatesListsStyleCSS
-
 from eric7.UI.Info import Version
-from eric7 import Utilities
+from eric7.Utilities import ModuleParser

 # list of supported filename extensions
 supportedExtensions = [".py", ".pyw", ".ptl", ".rb"]
--- a/src/eric7/eric7_editor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_editor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 version of the integrated MiniEditor module.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_hexeditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_hexeditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 of the integrated hex editor.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_iconeditor.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_iconeditor.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 of the integrated icon editor.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_ide.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_ide.py	Fri Nov 04 13:52:26 2022 +0100
@@ -17,8 +17,8 @@
 import multiprocessing
 import os
 import sys
+import time
 import traceback
-import time

 originalPathString = os.getenv("PATH")

@@ -36,7 +36,7 @@
 restartArgs = [arg for arg in sys.argv[1:] if arg.split("=", 1)[0] in restartArgsList]

 try:
-    from PyQt6.QtCore import qWarning, QLibraryInfo, QTimer, QCoreApplication
+    from PyQt6.QtCore import QCoreApplication, QLibraryInfo, QTimer, qWarning
 except ImportError:
     try:
         from tkinter import messagebox
@@ -145,8 +145,8 @@
     @param excValue exception value
     @param tracebackobj traceback object
     """
+    from eric7 import Globals, Utilities
     from eric7.UI.Info import BugAddress
-    from eric7 import Globals, Utilities

     # Workaround for a strange issue with QScintilla
     if str(excValue) == "unable to convert a QVariant back to a Python object":
@@ -309,7 +309,7 @@
     Startup.initializeResourceSearchPath(app)

     # generate and show a splash window, if not suppressed
-    from eric7.UI.SplashScreen import SplashScreen, NoneSplashScreen
+    from eric7.UI.SplashScreen import NoneSplashScreen, SplashScreen

     if "--no-splash" in sys.argv and sys.argv.index("--no-splash") < ddindex:
         sys.argv.remove("--no-splash")
--- a/src/eric7/eric7_plugininstall.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_plugininstall.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 IDE.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_pluginrepository.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_pluginrepository.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 IDE.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_pluginuninstall.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_pluginuninstall.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 IDE.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_post_install.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_post_install.py	Fri Nov 04 13:52:26 2022 +0100
@@ -8,11 +8,11 @@
 Module implementing the post install logic for 'pip install'.
 """

-import sys
+import contextlib
 import os
 import shutil
+import sys
 import sysconfig
-import contextlib

 ######################################################################
 ## Post installation hooks for Windows below
@@ -122,8 +122,8 @@
     @param iconPath path of the icon file
     @type str
     """
+    from pywintypes import com_error
     from win32com.client import Dispatch
-    from pywintypes import com_error

     with contextlib.suppress(com_error):
         shell = Dispatch("WScript.Shell")
--- a/src/eric7/eric7_qregularexpression.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_qregularexpression.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 a standalone version of the integrated QRegularExpression wizard.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_re.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_re.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 standalone version of the integrated PyRegExp wizard.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_shell.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_shell.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 of the ShellWindow module and starts the Qt event loop.
 """

+import os
 import sys
-import os

 originalPathString = os.getenv("PATH")

@@ -35,7 +35,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_snap.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_snap.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 of the snapshot module and starts the Qt event loop.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_sqlbrowser.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_sqlbrowser.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 of the SQL browser and starts the Qt event loop.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_testing.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_testing.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 version of the integrated testing module.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_tray.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_tray.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 context menu to start the eric IDE and the eric tools.
 """

+import os
 import sys
-import os

 SettingsDir = None

@@ -36,7 +36,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_trpreviewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_trpreviewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 of the integrated tr previewer.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,11 +34,9 @@
         sys.argv.remove(arg)

 from eric7.EricWidgets.EricApplication import EricApplication
-
+from eric7.Globals import AppInfo
+from eric7.Toolbox import Startup
 from eric7.Tools.TRSingleApplication import TRSingleApplicationClient
-from eric7.Globals import AppInfo
-
-from eric7.Toolbox import Startup

 app = None
--- a/src/eric7/eric7_uipreviewer.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_uipreviewer.py	Fri Nov 04 13:52:26 2022 +0100
@@ -12,8 +12,8 @@
 of the integrated ui previewer.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -34,7 +34,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7_virtualenv.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7_virtualenv.py	Fri Nov 04 13:52:26 2022 +0100
@@ -11,8 +11,8 @@
 outside of the IDE.
 """

+import os
 import sys
-import os

 for arg in sys.argv[:]:
     if arg.startswith("--config="):
@@ -33,7 +33,6 @@
         sys.argv.remove(arg)

 from eric7.Globals import AppInfo
-
 from eric7.Toolbox import Startup
--- a/src/eric7/eric7config.py	Fri Nov 04 13:46:31 2022 +0100
+++ b/src/eric7/eric7config.py	Fri Nov 04 13:52:26 2022 +0100
@@ -7,8 +7,8 @@
 Module containing the default configuration of the eric installation.
 """

+import contextlib
 import os
-import contextlib

 __ericDir = os.path.dirname(__file__)