Mercurial Repositories > Flask Project / file diff

diff -r bd9eb721aeed -r 662e5eb1ba8b ProjectFlask/Project.py
--- a/ProjectFlask/Project.py	Sat Nov 26 17:43:53 2022 +0100
+++ b/ProjectFlask/Project.py	Wed Dec 21 09:59:34 2022 +0100
@@ -23,13 +23,26 @@
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.Globals import isWindowsPlatform
 
 try:
     from eric7.EricGui import EricPixmapCache
 except ImportError:
     from UI import PixmapCache as EricPixmapCache
 
+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
+
 from .FlaskBabelExtension.PyBabelProjectExtension import PyBabelProject
 from .FlaskMigrateExtension.MigrateProjectExtension import MigrateProject
 
@@ -481,7 +494,7 @@
             else [
                 os.path.join(virtualEnv, "bin", command),
                 os.path.join(virtualEnv, "local", "bin", command),
-                Utilities.getExecutablePath(command),
+                getExecutablePath(command),
                 command,
             ]  # fall back to just cmd
         )
@@ -524,7 +537,7 @@
                 if fullCmd:
                     variants.append("Python3")
             else:
-                fullCmds = Utilities.getExecutablePaths("flask")
+                fullCmds = getExecutablePaths("flask")
                 for fullCmd in fullCmds:
                     try:
                         with open(fullCmd, "r", encoding="utf-8") as f:
@@ -885,7 +898,7 @@
                 self.__terminatePythonShell()
 
                 args = Utilities.parseOptionString(consoleCmd)
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = getExecutablePath(args[0])
                 args += [command, "shell"]
 
                 self.__shellProcess = QProcess()