diff -r 5798ee4a8807 -r 3f23dbf37dbe src/eric7/Plugins/VcsPlugins/vcsGit/GitDiffDialog.py --- 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):