diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py
--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Sun Dec 18 19:33:46 2022 +0100
@@ -11,12 +11,12 @@
from PyQt6.QtCore import pyqtSlot
-from eric7 import Globals
from eric7.EricWidgets.EricApplication import ericApp
from eric7.EricWidgets.EricPathPicker import EricPathPickerModes
from eric7.Preferences.ConfigurationPages.ConfigurationPageBase import (
ConfigurationPageBase,
)
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
from eric7.Utilities import supportedCodecs
from .. import HgUtilities
@@ -41,7 +41,7 @@
self.__plugin = plugin
self.hgPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
- if Globals.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
self.hgPicker.setFilters(self.tr("Executable Files (*.exe);;All Files (*)"))
else:
self.hgPicker.setFilters(self.tr("All Files (*)"))
@@ -148,7 +148,9 @@
Private slot to install Mercurial alongside eric7.
"""
pip = ericApp().getObject("Pip")
- pip.installPackages(["mercurial"], interpreter=Globals.getPythonExecutable())
+ pip.installPackages(
+ ["mercurial"], interpreter=PythonUtilities.getPythonExecutable()
+ )
self.installButton.setEnabled(not self.__mercurialInstalled())
def __mercurialInstalled(self):
