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