Mercurial Repositories > Django Project / file diff

--- a/ProjectDjango/DjangoCheckOptionsDialog.py	Sat Nov 26 17:32:34 2022 +0100
+++ b/ProjectDjango/DjangoCheckOptionsDialog.py	Wed Dec 21 09:27:28 2022 +0100
@@ -9,17 +9,27 @@
 
 import os
 
-from PyQt6.QtCore import pyqtSlot, Qt, QProcess
+from PyQt6.QtCore import QProcess, Qt, pyqtSlot
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Preferences, Utilities
+from eric7 import Preferences
 
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
+
 from eric7.EricWidgets import EricFileDialog
 
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import (
+        relativeUniversalPath,
+        toNativeSeparators,
+    )
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import relativeUniversalPath, toNativeSeparators
+
 from .Ui_DjangoCheckOptionsDialog import Ui_DjangoCheckOptionsDialog
 
 
@@ -93,7 +103,7 @@
         @rtype str
         """
         start = self.__path[:-1] if self.__path.endswith(("/", "\\")) else self.__path
-        relPath = Utilities.relativeUniversalPath(path, start)
+        relPath = relativeUniversalPath(path, start)
         mod = os.path.splitext(relPath)[0].replace("/", ".")
         return mod
 
@@ -111,7 +121,7 @@
             if not os.path.isabs(mod):
                 mod = os.path.join(self.__path, mod)
 
-            path = Utilities.toNativeSeparators(mod)
+            path = toNativeSeparators(mod)
         else:
             path = ""
         return path