diff -r 9c1f429cb56b -r b47dfa7a137d src/eric7/PipInterface/Pip.py
--- a/src/eric7/PipInterface/Pip.py Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/PipInterface/Pip.py Sun Dec 18 19:33:46 2022 +0100
@@ -16,10 +16,11 @@
from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
from PyQt6.QtWidgets import QDialog, QInputDialog, QLineEdit
-from eric7 import Globals, Preferences
+from eric7 import Preferences
from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
from eric7.EricWidgets import EricMessageBox
from eric7.EricWidgets.EricApplication import ericApp
+from eric7.SystemUtilities import OSUtilities, PythonUtilities
from eric7.UI.DeleteFilesConfirmationDialog import DeleteFilesConfirmationDialog
try:
@@ -147,9 +148,9 @@
with contextlib.suppress(KeyError):
return os.environ["PIP_CONFIG_FILE"]
- if Globals.isWindowsPlatform():
+ if OSUtilities.isWindowsPlatform():
config = os.path.join(os.environ["APPDATA"], "pip", "pip.ini")
- elif Globals.isMacPlatform():
+ elif OSUtilities.isMacPlatform():
config = os.path.expanduser("~/Library/Application Support/pip/pip.conf")
else:
config = os.path.expanduser("~/.config/pip/pip.conf")
@@ -168,7 +169,7 @@
# Unix, OS X: $VIRTUAL_ENV/pip.conf
# Windows: %VIRTUAL_ENV%\pip.ini
- pip = "pip.ini" if Globals.isWindowsPlatform() else "pip.conf"
+ pip = "pip.ini" if OSUtilities.isWindowsPlatform() else "pip.conf"
venvManager = ericApp().getObject("VirtualEnvManager")
venvDirectory = (
@@ -363,7 +364,7 @@
if self.getVirtualenvInterpreter(venvName) in (
sys.executable,
- Globals.getPythonExecutable(),
+ PythonUtilities.getPythonExecutable(),
):
upgradePyQt = self.__checkUpgradePyQt(packages)
upgradeEric = self.__checkUpgradeEric(packages)
