Mercurial Repositories > cx_freeze Packager / file diff

--- a/CxFreeze/CxfreezeConfigDialog.py	Tue Oct 25 09:03:43 2022 +0200
+++ b/CxFreeze/CxfreezeConfigDialog.py	Wed Dec 21 09:03:33 2022 +0100
@@ -7,23 +7,33 @@
 Module implementing a dialog to enter the parameters for cxfreeze.
 """
 
-import sys
+import contextlib
+import copy
 import os
-import copy
-import contextlib
+import sys
 
-from PyQt6.QtCore import pyqtSlot, QDir, QProcess
+from PyQt6.QtCore import QDir, QProcess, pyqtSlot
 from PyQt6.QtWidgets import QDialog, QListWidgetItem
 
-from eric7 import Utilities
-
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
+
 from eric7.EricWidgets.EricDirFileDialog import EricDirFileDialog
 from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
 
+try:
+    from eric7.SystemUtilities.OSUtilities import isMacPlatform, isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isMacPlatform, isWindowsPlatform
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import toNativeSeparators
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import toNativeSeparators
+
 from .Ui_CxfreezeConfigDialog import Ui_CxfreezeConfigDialog
 
 
@@ -55,9 +65,9 @@
 
         iconsI18N = self.tr("Icons")
         allFilesI18N = self.tr("All files")
-        if Utilities.isWindowsPlatform():
+        if isWindowsPlatform():
             iconFilter = "{0} (*.ico);;{1} (*.*)".format(iconsI18N, allFilesI18N)
-        elif Utilities.isMacPlatform():
+        elif isMacPlatform():
             iconFilter = "{0} (*.icns *.png);;{1} (*.*)".format(iconsI18N, allFilesI18N)
         else:
             iconFilter = "{0} (*.png);;{1} (*.*)".format(iconsI18N, allFilesI18N)
@@ -253,7 +263,7 @@
         @type str
         """
         # version specific setup
-        if Utilities.isWindowsPlatform():
+        if isWindowsPlatform():
             # remove "\Scripts\cx_Freeze.bat" from path
             dirname = os.path.dirname(text)
             dirname = os.path.dirname(dirname)
@@ -296,7 +306,7 @@
         if modpath:
             d = QDir(os.path.join(modpath, "bases"))
             basesList = d.entryList(QDir.Filter.Files)
-            if Utilities.isWindowsPlatform():
+            if isWindowsPlatform():
                 # strip the final '.exe' from the bases
                 tmpBasesList = basesList[:]
                 basesList = []
@@ -396,7 +406,7 @@
 
         for itm in items:
             itm = self.__project.getRelativePath(itm)
-            self.fileOrFolderList.addItem(Utilities.toNativeSeparators(itm))
+            self.fileOrFolderList.addItem(toNativeSeparators(itm))
         row = self.fileOrFolderList.currentRow()
         self.on_fileOrFolderList_currentRowChanged(row)