Mercurial Repositories > eric / file diff

--- a/src/eric7/PluginManager/PluginManager.py	Sun Dec 18 14:19:10 2022 +0100
+++ b/src/eric7/PluginManager/PluginManager.py	Sun Dec 18 19:33:46 2022 +0100
@@ -20,13 +20,14 @@
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import Globals, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricXML.PluginRepositoryReader import PluginRepositoryReader
 from eric7.Globals import getConfig
+from eric7.SystemUtilities import FileSystemUtilities, PythonUtilities
 
 try:
     from eric7.EricNetwork.EricSslErrorHandler import (
@@ -118,13 +119,13 @@
         self.pluginDirs = {
             "eric7": os.path.join(getConfig("ericDir"), "Plugins"),
             "global": os.path.join(
-                Utilities.getPythonLibraryDirectory(), "eric7plugins"
+                PythonUtilities.getPythonLibraryDirectory(), "eric7plugins"
             ),
-            "user": os.path.join(Utilities.getConfigDir(), "eric7plugins"),
+            "user": os.path.join(Globals.getConfigDir(), "eric7plugins"),
         }
         self.__priorityOrder = ["eric7", "global", "user"]
 
-        self.__defaultDownloadDir = os.path.join(Utilities.getConfigDir(), "Downloads")
+        self.__defaultDownloadDir = os.path.join(Globals.getConfigDir(), "Downloads")
 
         self.__activePlugins = {}
         self.__inactivePlugins = {}
@@ -157,7 +158,7 @@
         self.__checkPluginsDownloadDirectory()
 
         self.pluginRepositoryFile = os.path.join(
-            Utilities.getConfigDir(), "PluginRepository"
+            Globals.getConfigDir(), "PluginRepository"
         )
 
         # attributes for the network objects
@@ -205,7 +206,7 @@
             directories (boolean) and a message (string)
         """
         if self.__develPluginFile:
-            path = Utilities.splitPath(self.__develPluginFile)[0]
+            path = FileSystemUtilities.splitPath(self.__develPluginFile)[0]
             fname = os.path.join(path, "__init__.py")
             if not os.path.exists(fname):
                 try:
@@ -314,7 +315,7 @@
                 EricPixmapCache.addSearchPath(self.pluginDirs[key])
 
         if self.__develPluginFile:
-            path = Utilities.splitPath(self.__develPluginFile)[0]
+            path = FileSystemUtilities.splitPath(self.__develPluginFile)[0]
             if path not in sys.path:
                 sys.path.insert(2, path)
             EricPixmapCache.addSearchPath(path)
@@ -325,7 +326,7 @@
         """
         develPluginName = ""
         if self.__develPluginFile:
-            develPluginPath, develPluginName = Utilities.splitPath(
+            develPluginPath, develPluginName = FileSystemUtilities.splitPath(
                 self.__develPluginFile
             )
             if self.isValidPluginName(develPluginName):
@@ -1455,7 +1456,7 @@
             from eric7.PipInterface.Pip import Pip  # __IGNORE_WARNING_I101__
 
             pip = Pip(self)
-        pip.installPackages(packages, interpreter=Globals.getPythonExecutable())
+        pip.installPackages(packages, interpreter=PythonUtilities.getPythonExecutable())
 
 
 #