src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py

branch
eric7
changeset 9624
b47dfa7a137d
parent 9473
3f23dbf37dbe
child 9653
e67609152c5e
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUtilities.py	Sun Dec 18 19:33:46 2022 +0100
@@ -12,8 +12,7 @@
 
 from PyQt6.QtCore import QCoreApplication, QProcess, QProcessEnvironment
 
-from eric7 import Utilities
-from eric7.Globals import isWindowsPlatform
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
 
 
 def getHgExecutable():
@@ -28,10 +27,10 @@
     exe = VcsMercurialPlugin.getPreferences("MercurialExecutablePath")
     if not exe:
         program = "hg"
-        if isWindowsPlatform():
+        if OSUtilities.isWindowsPlatform():
             program += ".exe"
 
-        progPath = os.path.join(Utilities.getPythonScriptsDirectory(), program)
+        progPath = os.path.join(PythonUtilities.getPythonScriptsDirectory(), program)
         if os.path.exists(progPath):
             exe = progPath
 
@@ -48,11 +47,11 @@
     @return filename of the config file
     @rtype str
     """
-    if Utilities.isWindowsPlatform():
+    if OSUtilities.isWindowsPlatform():
         userprofile = os.environ["USERPROFILE"]
         return os.path.join(userprofile, "Mercurial.ini")
     else:
-        homedir = Utilities.getHomeDir()
+        homedir = OSUtilities.getHomeDir()
         return os.path.join(homedir, ".hgrc")
 
 

eric ide

mercurial