Mercurial Repositories > Pyramid Project / file diff

diff -r e3ed5e2856d7 -r 277a93891db9 ProjectPyramid/Project.py
--- a/ProjectPyramid/Project.py	Sat Nov 26 18:02:44 2022 +0100
+++ b/ProjectPyramid/Project.py	Wed Dec 21 10:12:45 2022 +0100
@@ -15,16 +15,36 @@
 import subprocess  # secok
 import sys
 
-from PyQt6.QtCore import pyqtSlot, QObject, QFileInfo, QTimer, QUrl, QIODeviceBase
+from PyQt6.QtCore import (
+    QFileInfo,
+    QIODeviceBase,
+    QObject,
+    QProcess as QProcessPyQt,
+    QTimer,
+    QUrl,
+    pyqtSlot,
+)
 from PyQt6.QtGui import QDesktopServices
-from PyQt6.QtWidgets import QMenu, QDialog, QInputDialog, QLineEdit
-from PyQt6.QtCore import QProcess as QProcessPyQt
+from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit, QMenu
 
 from eric7 import Preferences, Utilities
 from eric7.EricGui.EricAction import EricAction
+from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.EricWidgets import EricMessageBox, EricFileDialog
-from eric7.Globals import isWindowsPlatform
+
+try:
+    from eric7.SystemUtilities.FileSystemUtilities import (
+        getExecutablePath,
+        getExecutablePaths,
+    )
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Utilities import getExecutablePath, getExecutablePaths
+try:
+    from eric7.SystemUtilities.OSUtilities import isWindowsPlatform
+except ImportError:
+    # imports for eric < 23.1
+    from eric7.Globals import isWindowsPlatform
 
 try:
     from eric7.EricGui import EricPixmapCache
@@ -840,7 +860,7 @@
                 else:
                     if cmd:
                         try:
-                            fullCmds = Utilities.getExecutablePaths(cmd)
+                            fullCmds = getExecutablePaths(cmd)
                         except AttributeError:
                             fullCmds = self.__getExecutablePaths(cmd)
                         for fullCmd in fullCmds:
@@ -973,7 +993,7 @@
             fullCmds = [
                 os.path.join(virtualEnv, "bin", cmd),
                 os.path.join(virtualEnv, "local", "bin", cmd),
-                Utilities.getExecutablePath(cmd),
+                getExecutablePath(cmd),
                 cmd,  # fall back to just cmd
             ]
             for cmd in fullCmds:
@@ -1421,7 +1441,7 @@
                 return
 
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(
                 self.getPyramidCommand(
                     "pserve", virtualEnv=self.getProjectVirtualEnvironment()
@@ -1522,7 +1542,7 @@
                 return
 
             args = Utilities.parseOptionString(consoleCmd)
-            args[0] = Utilities.getExecutablePath(args[0])
+            args[0] = getExecutablePath(args[0])
             args.append(
                 self.getPyramidCommand(
                     "pshell", virtualEnv=self.getProjectVirtualEnvironment()