Mercurial Repositories > PyInstaller Interface / file diff

diff -r 40a4b95ca9be -r 37e614c54ea5 PyInstallerInterface/PyInstallerConfigDialog.py
--- a/PyInstallerInterface/PyInstallerConfigDialog.py	Tue Oct 25 08:57:22 2022 +0200
+++ b/PyInstallerInterface/PyInstallerConfigDialog.py	Wed Dec 21 09:11:59 2022 +0100
@@ -12,9 +12,14 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from eric7 import Globals
 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 isWindowsPlatform, isMacPlatform
+
 from .Ui_PyInstallerConfigDialog import Ui_PyInstallerConfigDialog
 
 
@@ -76,11 +81,11 @@
 
         self.iconFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.iconFilePicker.setDefaultDirectory(self.__project.getProjectPath())
-        if Globals.isMacPlatform():
+        if isMacPlatform():
             self.iconFilePicker.setFilters(
                 self.tr("Icon Files (*.icns);;" "All Files (*)")
             )
-        elif Globals.isWindowsPlatform():
+        elif isWindowsPlatform():
             self.iconFilePicker.setFilters(
                 self.tr(
                     "Icon Files (*.ico);;" "Executable Files (*.exe);;" "All Files (*)"
@@ -90,10 +95,10 @@
         # disable platform specific tabs
         self.tabWidget.setTabEnabled(
             self.tabWidget.indexOf(self.windowsMacTab),
-            Globals.isMacPlatform() or Globals.isWindowsPlatform(),
+            isMacPlatform() or isWindowsPlatform(),
         )
         self.tabWidget.setTabEnabled(
-            self.tabWidget.indexOf(self.macTab), Globals.isMacPlatform()
+            self.tabWidget.indexOf(self.macTab), isMacPlatform()
         )
 
         self.__initializeDefaults()