Mercurial Repositories > eric / file diff

--- a/src/eric7/Debugger/DebuggerInterfacePython.py	Thu Dec 01 10:18:07 2022 +0100
+++ b/src/eric7/Debugger/DebuggerInterfacePython.py	Mon Jan 02 11:16:03 2023 +0100
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>
+# Copyright (c) 2009 - 2023 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 
 """
@@ -15,10 +15,11 @@
 
 from PyQt6.QtCore import QObject, QProcess, QProcessEnvironment, QTimer
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Globals import getConfig
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities, PythonUtilities
 
 from . import DebugClientCapabilities
 
@@ -190,7 +191,7 @@
             execPath = venvManager.getVirtualenvExecPath(venvName)
         if interpreter == "":
             # use the interpreter used to run eric for identical variants
-            interpreter = Globals.getPythonExecutable()
+            interpreter = PythonUtilities.getPythonExecutable()
         if interpreter == "":
             EricMessageBox.critical(
                 None,
@@ -232,15 +233,15 @@
                 if multiprocessEnabled:
                     args.append(multiprocessEnabled)
                 args.extend([str(port), redirect, ipaddr])
-                if Utilities.isWindowsPlatform():
+                if OSUtilities.isWindowsPlatform():
                     if not os.path.splitext(args[0])[1]:
                         for ext in [".exe", ".com", ".cmd", ".bat"]:
-                            prog = Utilities.getExecutablePath(args[0] + ext)
+                            prog = FileSystemUtilities.getExecutablePath(args[0] + ext)
                             if prog:
                                 args[0] = prog
                                 break
                 else:
-                    args[0] = Utilities.getExecutablePath(args[0])
+                    args[0] = FileSystemUtilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], workingDir=workingDir)
                 if process is None:
                     EricMessageBox.critical(
@@ -301,7 +302,7 @@
                 if multiprocessEnabled:
                     args.append(multiprocessEnabled)
                 args.extend([str(port), "0", ipaddr])
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = FileSystemUtilities.getExecutablePath(args[0])
                 process = self.__startProcess(
                     args[0], args[1:], clientEnv, workingDir=workingDir
                 )
@@ -445,15 +446,15 @@
                 if multiprocessEnabled:
                     args.append(multiprocessEnabled)
                 args.extend([str(port), redirect, ipaddr])
-                if Utilities.isWindowsPlatform():
+                if OSUtilities.isWindowsPlatform():
                     if not os.path.splitext(args[0])[1]:
                         for ext in [".exe", ".com", ".cmd", ".bat"]:
-                            prog = Utilities.getExecutablePath(args[0] + ext)
+                            prog = FileSystemUtilities.getExecutablePath(args[0] + ext)
                             if prog:
                                 args[0] = prog
                                 break
                 else:
-                    args[0] = Utilities.getExecutablePath(args[0])
+                    args[0] = FileSystemUtilities.getExecutablePath(args[0])
                 process = self.__startProcess(args[0], args[1:], workingDir=workingDir)
                 if process is None:
                     EricMessageBox.critical(
@@ -514,7 +515,7 @@
                 if multiprocessEnabled:
                     args.append(multiprocessEnabled)
                 args.extend([str(port), "0", ipaddr])
-                args[0] = Utilities.getExecutablePath(args[0])
+                args[0] = FileSystemUtilities.getExecutablePath(args[0])
                 process = self.__startProcess(
                     args[0], args[1:], clientEnv, workingDir=workingDir
                 )