diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/UI/DiffDialog.py
--- a/src/eric7/UI/DiffDialog.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/UI/DiffDialog.py Sun Dec 18 19:33:46 2022 +0100
@@ -18,10 +18,11 @@
from PyQt6.QtGui import QTextCursor
from PyQt6.QtWidgets import QApplication, QDialogButtonBox, QWidget
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
from eric7.EricWidgets import EricFileDialog, EricMessageBox
from eric7.EricWidgets.EricMainWindow import EricMainWindow
from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
+from eric7.SystemUtilities import FileSystemUtilities
from .DiffHighlighter import DiffHighlighter
from .Ui_DiffDialog import Ui_DiffDialog
@@ -103,7 +104,7 @@
It saves the diff shown in the dialog to a file in the local
filesystem.
"""
- dname, fname = Utilities.splitPath(self.filename2)
+ dname, fname = FileSystemUtilities.splitPath(self.filename2)
fname = "{0}.diff".format(self.filename2) if fname != "." else dname
fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
@@ -156,7 +157,7 @@
"""
Private slot to handle the Compare button press.
"""
- self.filename1 = Utilities.toNativeSeparators(self.file1Picker.text())
+ self.filename1 = FileSystemUtilities.toNativeSeparators(self.file1Picker.text())
try:
filemtime1 = time.ctime(os.stat(self.filename1).st_mtime)
except OSError:
@@ -174,7 +175,7 @@
)
return
- self.filename2 = Utilities.toNativeSeparators(self.file2Picker.text())
+ self.filename2 = FileSystemUtilities.toNativeSeparators(self.file2Picker.text())
try:
filemtime2 = time.ctime(os.stat(self.filename2).st_mtime)
except OSError:
