--- 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):