Mercurial Repositories > eric / changeset

--- a/src/eric7/EricNetwork/EricGoogleMail.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/EricNetwork/EricGoogleMail.py	Wed Sep 25 14:48:57 2024 +0200
@@ -17,7 +17,7 @@
 from googleapiclient import discovery, errors
 from PyQt6.QtCore import QObject, pyqtSignal
 
-from eric7 import Globals
+from eric7 import EricUtilities
 
 from .EricGoogleMailHelpers import CLIENT_SECRET_FILE, SCOPES, TOKEN_FILE
 
@@ -78,7 +78,9 @@
         authorization flow.
         """
         # check for availability of secrets file
-        if not os.path.exists(os.path.join(Globals.getConfigDir(), CLIENT_SECRET_FILE)):
+        if not os.path.exists(
+            os.path.join(EricUtilities.getConfigDir(), CLIENT_SECRET_FILE)
+        ):
             self.sendResult.emit(
                 False,
                 self.tr(
@@ -99,7 +101,8 @@
                     credentials = None
             if not credentials or not credentials.valid:
                 flow = InstalledAppFlow.from_client_secrets_file(
-                    os.path.join(Globals.getConfigDir(), CLIENT_SECRET_FILE), SCOPES
+                    os.path.join(EricUtilities.getConfigDir(), CLIENT_SECRET_FILE),
+                    SCOPES,
                 )
                 credentials = flow.run_local_server(port=0)
             # Save the credentials for the next run
@@ -192,7 +195,7 @@
         " <code>{1}</code> with the name <code>{2}</code>.</li>"
         "</ol>".format(
             "https://console.developers.google.com/start/api?id=gmail",
-            Globals.getConfigDir(),
+            EricUtilities.getConfigDir(),
             CLIENT_SECRET_FILE,
         )
     )

--- a/src/eric7/EricNetwork/EricGoogleMailHelpers.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/EricNetwork/EricGoogleMailHelpers.py	Wed Sep 25 14:48:57 2024 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from eric7 import Globals
+from eric7 import EricUtilities
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.SystemUtilities import PythonUtilities
 
@@ -32,7 +32,9 @@
     @return flag indicating, that the credentials file is there
     @rtype bool
     """
-    return os.path.exists(os.path.join(Globals.getConfigDir(), CLIENT_SECRET_FILE))
+    return os.path.exists(
+        os.path.join(EricUtilities.getConfigDir(), CLIENT_SECRET_FILE)
+    )
 
 
 def installGoogleAPIPackages():

--- a/src/eric7/EricUtilities/__init__.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/EricUtilities/__init__.py	Wed Sep 25 14:48:57 2024 +0200
@@ -7,11 +7,48 @@
 Package containing utility modules and functions.
 """
 
+import os
+
 import semver
 
 from PyQt6.QtCore import QByteArray, QCoreApplication
 
 ###############################################################################
+## Functions dealing with the configuration directory.
+###############################################################################
+
+_configDir = None
+
+
+def getConfigDir():
+    """
+    Module function to get the name of the directory storing the config data.
+
+    @return directory name of the config dir
+    @rtype str
+    """
+    if _configDir is not None and os.path.exists(_configDir):
+        return _configDir
+    else:
+        confDir = os.path.join(os.path.expanduser("~"), ".eric7")
+        if not os.path.exists(confDir):
+            os.mkdir(confDir)
+        return confDir
+
+
+def setConfigDir(d):
+    """
+    Module function to set the name of the directory storing the config data.
+
+    @param d name of an existing directory
+    @type str
+    """
+    global _configDir
+
+    _configDir = os.path.expanduser(d)
+
+
+###############################################################################
 ## Functions for converting QSetting return types to valid types.
 ###############################################################################
 

--- a/src/eric7/Globals/__init__.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Globals/__init__.py	Wed Sep 25 14:48:57 2024 +0200
@@ -17,6 +17,8 @@
 
 from eric7.EricUtilities import (  # noqa
     dataString,
+    getConfigDir,
+    setConfigDir,
     strGroup,
     strToQByteArray,
     toBool,
@@ -53,25 +55,6 @@
 recentNameTestFramework = "UTTestFramework"
 recentNameTestEnvironment = "UTEnvironmentName"
 
-configDir = None
-
-
-def getConfigDir():
-    """
-    Module function to get the name of the directory storing the config data.
-
-    @return directory name of the config dir
-    @rtype str
-    """
-    if configDir is not None and os.path.exists(configDir):
-        hp = configDir
-    else:
-        cdn = ".eric7"
-        hp = os.path.join(os.path.expanduser("~"), cdn)
-        if not os.path.exists(hp):
-            os.mkdir(hp)
-    return hp
-
 
 def getInstallInfoFilePath():
     """
@@ -91,17 +74,6 @@
     return os.path.join(getConfigDir(), filename)
 
 
-def setConfigDir(d):
-    """
-    Module function to set the name of the directory storing the config data.
-
-    @param d name of an existing directory
-    @type str
-    """
-    global configDir
-    configDir = os.path.expanduser(d)
-
-
 ###############################################################################
 ## functions for web browser variant detection
 ###############################################################################

--- a/src/eric7/HelpViewer/HelpViewerWidget.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/HelpViewer/HelpViewerWidget.py	Wed Sep 25 14:48:57 2024 +0200
@@ -36,7 +36,7 @@
 except ImportError:
     WEBENGINE_AVAILABLE = False
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
@@ -685,7 +685,7 @@
         @return path of the QtHelp collection file
         @rtype str
         """
-        qthelpDir = os.path.join(Globals.getConfigDir(), "qthelp")
+        qthelpDir = os.path.join(EricUtilities.getConfigDir(), "qthelp")
         if not os.path.exists(qthelpDir):
             os.makedirs(qthelpDir, exist_ok=True)
         return os.path.join(qthelpDir, "eric7help.qhc")

--- a/src/eric7/PipInterface/PipVulnerabilityChecker.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/PipInterface/PipVulnerabilityChecker.py	Wed Sep 25 14:48:57 2024 +0200
@@ -23,7 +23,7 @@
 from PyQt6.QtCore import QCoreApplication, QObject, QThread, QUrl
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricMessageBox
 
 
@@ -82,7 +82,7 @@
 
         self.__pip = pip
 
-        securityDir = os.path.join(Globals.getConfigDir(), "security")
+        securityDir = os.path.join(EricUtilities.getConfigDir(), "security")
         os.makedirs(securityDir, mode=0o700, exist_ok=True)
         self.__cacheFile = os.path.join(securityDir, "vulnerability_cache.json")
         if not os.path.exists(self.__cacheFile):

--- a/src/eric7/PluginManager/PluginManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/PluginManager/PluginManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -23,7 +23,7 @@
 from PyQt6.QtGui import QPixmap
 from PyQt6.QtNetwork import QNetworkAccessManager, QNetworkReply, QNetworkRequest
 
-from eric7 import EricUtilities, Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
@@ -125,11 +125,13 @@
             "global": os.path.join(
                 PythonUtilities.getPythonLibraryDirectory(), "eric7plugins"
             ),
-            "user": os.path.join(Globals.getConfigDir(), "eric7plugins"),
+            "user": os.path.join(EricUtilities.getConfigDir(), "eric7plugins"),
         }
         self.__priorityOrder = ["eric7", "global", "user"]
 
-        self.__defaultDownloadDir = os.path.join(Globals.getConfigDir(), "Downloads")
+        self.__defaultDownloadDir = os.path.join(
+            EricUtilities.getConfigDir(), "Downloads"
+        )
 
         self.__activePlugins = {}
         self.__inactivePlugins = {}
@@ -162,7 +164,7 @@
         self.__checkPluginsDownloadDirectory()
 
         self.pluginRepositoryFile = os.path.join(
-            Globals.getConfigDir(), "PluginRepository"
+            EricUtilities.getConfigDir(), "PluginRepository"
         )
 
         # attributes for the network objects

--- a/src/eric7/PluginManager/PluginRepositoryDialog.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/PluginManager/PluginRepositoryDialog.py	Wed Sep 25 14:48:57 2024 +0200
@@ -45,7 +45,7 @@
     QWidget,
 )
 
-from eric7 import EricUtilities, Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 from eric7.EricWidgets import EricMessageBox
@@ -227,7 +227,7 @@
         )
 
         self.pluginRepositoryFile = os.path.join(
-            Globals.getConfigDir(), "PluginRepository"
+            EricUtilities.getConfigDir(), "PluginRepository"
         )
 
         self.__pluginManager.pluginRepositoryFileDownloaded.connect(self.__populateList)
@@ -1241,7 +1241,9 @@
                     )
 
     # step 3: delete entries of obsolete plug-ins
-    pluginRepositoryFile = os.path.join(Globals.getConfigDir(), "PluginRepository")
+    pluginRepositoryFile = os.path.join(
+        EricUtilities.getConfigDir(), "PluginRepository"
+    )
     if os.path.exists(pluginRepositoryFile):
         f = QFile(pluginRepositoryFile)
         if f.open(QIODevice.OpenModeFlag.ReadOnly):

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditEditor.py	Wed Sep 25 14:48:57 2024 +0200
@@ -62,9 +62,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 from PyQt6.QtCore import QTranslator, pyqtSlot
 from PyQt6.QtWidgets import QColorDialog, QDialog, QStyleFactory
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
@@ -141,7 +141,7 @@
         fnlist = (
             glob.glob("eric7_*.qm")
             + glob.glob(os.path.join(getConfig("ericTranslationsDir"), "eric7_*.qm"))
-            + glob.glob(os.path.join(Globals.getConfigDir(), "eric7_*.qm"))
+            + glob.glob(os.path.join(EricUtilities.getConfigDir(), "eric7_*.qm"))
         )
         locales = {}
         for fn in fnlist:

--- a/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 from PyQt6.QtCore import QTranslator, pyqtSlot
 from PyQt6.QtWidgets import QColorDialog, QDialog, QStyleFactory
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.EricWidgets.EricIconBar import EricIconBar
@@ -241,7 +241,7 @@
         fnlist = (
             glob.glob("eric7_*.qm")
             + glob.glob(os.path.join(getConfig("ericTranslationsDir"), "eric7_*.qm"))
-            + glob.glob(os.path.join(Globals.getConfigDir(), "eric7_*.qm"))
+            + glob.glob(os.path.join(EricUtilities.getConfigDir(), "eric7_*.qm"))
         )
         locales = {}
         for fn in fnlist:

--- a/src/eric7/Preferences/ThemeManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Preferences/ThemeManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 
 from PyQt6.QtCore import QObject
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.Globals import getConfig
 
@@ -86,7 +86,9 @@
             # step 1: process stylesheet data
             stylesheetDict = themeDict["stylesheet"]
             if stylesheetDict["name"]:
-                stylesheetsDir = os.path.join(Globals.getConfigDir(), "stylesheets")
+                stylesheetsDir = os.path.join(
+                    EricUtilities.getConfigDir(), "stylesheets"
+                )
                 if not os.path.exists(stylesheetsDir):
                     os.makedirs(stylesheetsDir)
                 stylesheetFile = os.path.join(stylesheetsDir, stylesheetDict["name"])

--- a/src/eric7/QScintilla/APIsManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/QScintilla/APIsManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -14,7 +14,7 @@
 from PyQt6.Qsci import QsciAPIs
 from PyQt6.QtCore import QLibraryInfo, QObject, pyqtSignal
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 
 from . import Lexers
 
@@ -223,7 +223,7 @@
         @return complete filename for the Prepared APIs file
         @rtype str
         """
-        apisDir = os.path.join(Globals.getConfigDir(), "APIs")
+        apisDir = os.path.join(EricUtilities.getConfigDir(), "APIs")
         if self.__apis is not None:
             if self.__projectType:
                 filename = "{0}_{1}.pap".format(self.__language, self.__projectType)

--- a/src/eric7/QScintilla/Editor.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/QScintilla/Editor.py	Wed Sep 25 14:48:57 2024 +0200
@@ -57,7 +57,7 @@
     QToolTip,
 )
 
-from eric7 import EricUtilities, Globals, Preferences, Utilities
+from eric7 import EricUtilities, Preferences, Utilities
 from eric7.CodeFormatting.BlackFormattingAction import BlackFormattingAction
 from eric7.CodeFormatting.BlackUtilities import aboutBlack
 from eric7.CodeFormatting.IsortFormattingAction import IsortFormattingAction
@@ -7868,7 +7868,7 @@
         """
         Public method to load a macro from a file.
         """
-        configDir = Globals.getConfigDir()
+        configDir = EricUtilities.getConfigDir()
         fname = EricFileDialog.getOpenFileName(
             self,
             self.tr("Load macro file"),
@@ -7907,7 +7907,7 @@
         """
         Public method to save a macro to a file.
         """
-        configDir = Globals.getConfigDir()
+        configDir = EricUtilities.getConfigDir()
 
         name, ok = self.__getMacroName()
         if not ok or not name:

--- a/src/eric7/QScintilla/SpellChecker.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/QScintilla/SpellChecker.py	Wed Sep 25 14:48:57 2024 +0200
@@ -14,7 +14,7 @@
 
 from PyQt6.QtCore import QObject, QTimer
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 
 with contextlib.suppress(ImportError, AttributeError, OSError):
     import enchant
@@ -98,9 +98,9 @@
         @rtype str
         """
         if isException:
-            return os.path.join(Globals.getConfigDir(), "spelling", "pel.dic")
+            return os.path.join(EricUtilities.getConfigDir(), "spelling", "pel.dic")
         else:
-            return os.path.join(Globals.getConfigDir(), "spelling", "pwl.dic")
+            return os.path.join(EricUtilities.getConfigDir(), "spelling", "pwl.dic")
 
     @classmethod
     def getUserDictionaryPath(cls, isException=False):

--- a/src/eric7/Templates/TemplateViewer.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Templates/TemplateViewer.py	Wed Sep 25 14:48:57 2024 +0200
@@ -15,7 +15,7 @@
 from PyQt6.QtCore import QCoreApplication, Qt, pyqtSlot
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QTreeWidget, QTreeWidgetItem
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
@@ -1034,7 +1034,7 @@
         @rtype bool
         """
         if filename is None:
-            filename = os.path.join(Globals.getConfigDir(), "eric7templates.ecj")
+            filename = os.path.join(EricUtilities.getConfigDir(), "eric7templates.ecj")
 
         return self.__templatesFile.writeFile(filename)
 
@@ -1046,7 +1046,7 @@
         @type str
         """
         if filename is None:
-            filename = os.path.join(Globals.getConfigDir(), "eric7templates.ecj")
+            filename = os.path.join(EricUtilities.getConfigDir(), "eric7templates.ecj")
             if not os.path.exists(filename):
                 return
 

--- a/src/eric7/Toolbox/Startup.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Toolbox/Startup.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 from PyQt6.QtCore import QDir, QLibraryInfo, QLocale, QTranslator
 from PyQt6.QtWidgets import QApplication
 
-from eric7 import Globals
+from eric7 import EricUtilities
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets.EricApplication import EricApplication
 from eric7.Globals import getConfig
@@ -126,7 +126,7 @@
     if loc == "System":
         loc = QLocale.system().name()
     if loc != "C":
-        dirs = [getConfig("ericTranslationsDir"), Globals.getConfigDir()]
+        dirs = [getConfig("ericTranslationsDir"), EricUtilities.getConfigDir()]
         if qtTransDir is not None:
             dirs.append(qtTransDir)
 

--- a/src/eric7/Tools/TrayStarter.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/Tools/TrayStarter.py	Wed Sep 25 14:48:57 2024 +0200
@@ -18,7 +18,7 @@
 from PyQt6.QtGui import QCursor
 from PyQt6.QtWidgets import QApplication, QDialog, QMenu, QSystemTrayIcon
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Globals, Preferences
 from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
@@ -317,7 +317,7 @@
 
         args = []
         args.append(applPath)
-        args.append("--config={0}".format(Globals.getConfigDir()))
+        args.append("--config={0}".format(EricUtilities.getConfigDir()))
         if self.settingsDir:
             args.append("--settings={0}".format(self.settingsDir))
         for arg in applArgs:

--- a/src/eric7/UI/UserInterface.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/UI/UserInterface.py	Wed Sep 25 14:48:57 2024 +0200
@@ -4779,7 +4779,7 @@
         from .ErrorLogDialog import ErrorLogDialog
 
         if Preferences.getUI("CheckErrorLog"):
-            logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+            logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
             if os.path.exists(logFile):
                 dlg = ErrorLogDialog(logFile, False, self)
                 dlg.exec()
@@ -4791,7 +4791,7 @@
         @return flag indicating the existence of an error log file
         @rtype bool
         """
-        logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+        logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
         return os.path.exists(logFile)
 
     def __showErrorLog(self):
@@ -4800,7 +4800,7 @@
         """
         from .ErrorLogDialog import ErrorLogDialog
 
-        logFile = os.path.join(Globals.getConfigDir(), self.ErrorLogFileName)
+        logFile = os.path.join(EricUtilities.getConfigDir(), self.ErrorLogFileName)
         if os.path.exists(logFile):
             dlg = ErrorLogDialog(logFile, True, self)
             dlg.show()
@@ -7750,14 +7750,14 @@
         """
         Private slot to write the tasks data to a JSON file (.etj).
         """
-        fn = os.path.join(Globals.getConfigDir(), "eric7tasks.etj")
+        fn = os.path.join(EricUtilities.getConfigDir(), "eric7tasks.etj")
         self.__tasksFile.writeFile(fn)
 
     def __readTasks(self):
         """
         Private slot to read in the tasks file (.etj).
         """
-        fn = os.path.join(Globals.getConfigDir(), "eric7tasks.etj")
+        fn = os.path.join(EricUtilities.getConfigDir(), "eric7tasks.etj")
         if os.path.exists(fn):
             self.__tasksFile.readFile(fn)
 
@@ -7792,7 +7792,7 @@
         fn = (
             filename
             if filename
-            else os.path.join(Globals.getConfigDir(), "eric7session.esj")
+            else os.path.join(EricUtilities.getConfigDir(), "eric7session.esj")
         )
 
         return self.__sessionFile.writeFile(fn)
@@ -7809,7 +7809,7 @@
         if filename:
             fn = filename
         else:
-            fn = os.path.join(Globals.getConfigDir(), "eric7session.esj")
+            fn = os.path.join(EricUtilities.getConfigDir(), "eric7session.esj")
             if not os.path.exists(fn):
                 EricMessageBox.critical(
                     self,
@@ -7881,10 +7881,12 @@
         @rtype str
         """
         if globPattern:
-            return os.path.join(Globals.getConfigDir(), "eric7_crash_session_*.esj")
+            return os.path.join(
+                EricUtilities.getConfigDir(), "eric7_crash_session_*.esj"
+            )
         else:
             return os.path.join(
-                Globals.getConfigDir(), f"eric7_crash_session_{os.getpid()}.esj"
+                EricUtilities.getConfigDir(), f"eric7_crash_session_{os.getpid()}.esj"
             )
 
     def __getCrashedSessions(self):

--- a/src/eric7/WebBrowser/AdBlock/AdBlockManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 from PyQt6.QtCore import QByteArray, QMutex, QObject, QUrl, QUrlQuery, pyqtSignal
 from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricUtilities.EricMutexLocker import EricMutexLocker
 from eric7.EricWidgets import EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
@@ -206,7 +206,9 @@
         @return URL for custom subscriptions
         @rtype QUrl
         """
-        dataDir = os.path.join(Globals.getConfigDir(), "web_browser", "subscriptions")
+        dataDir = os.path.join(
+            EricUtilities.getConfigDir(), "web_browser", "subscriptions"
+        )
         if not os.path.exists(dataDir):
             os.makedirs(dataDir)
         fileName = os.path.join(dataDir, "adblock_subscription_custom")

--- a/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/AdBlock/AdBlockSubscription.py	Wed Sep 25 14:48:57 2024 +0200
@@ -26,7 +26,7 @@
 )
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
@@ -285,7 +285,9 @@
                 self.__location, QCryptographicHash.Algorithm.Sha1
             ).toHex()
         ).decode()
-        dataDir = os.path.join(Globals.getConfigDir(), "web_browser", "subscriptions")
+        dataDir = os.path.join(
+            EricUtilities.getConfigDir(), "web_browser", "subscriptions"
+        )
         if not os.path.exists(dataDir):
             os.makedirs(dataDir)
         fileName = os.path.join(dataDir, "adblock_subscription_{0}".format(sha1))

--- a/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/Bookmarks/BookmarksManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -26,7 +26,7 @@
 from PyQt6.QtGui import QUndoCommand, QUndoStack
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Globals
+from eric7 import EricUtilities
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
 
@@ -101,7 +101,9 @@
         @return name of the bookmark file
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "bookmarks.xbel")
+        return os.path.join(
+            EricUtilities.getConfigDir(), "web_browser", "bookmarks.xbel"
+        )
 
     def close(self):
         """

--- a/src/eric7/WebBrowser/CookieJar/CookieJar.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/CookieJar/CookieJar.py	Wed Sep 25 14:48:57 2024 +0200
@@ -13,7 +13,7 @@
 from PyQt6.QtCore import QSettings, pyqtSignal, pyqtSlot
 from PyQt6.QtNetwork import QNetworkCookie, QNetworkCookieJar
 
-from eric7 import EricUtilities, Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.Utilities.AutoSaver import AutoSaver
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
@@ -72,7 +72,7 @@
         self.__saveTimer = AutoSaver(self, self.__save)
 
         self.__cookiesFile = os.path.join(
-            Globals.getConfigDir(), "web_browser", "cookies.ini"
+            EricUtilities.getConfigDir(), "web_browser", "cookies.ini"
         )
 
         self.__store = WebBrowserWindow.webProfile().cookieStore()

--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -26,7 +26,7 @@
 )
 from PyQt6.QtWidgets import QDialog
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.WebBrowser.JavaScript.ExternalJsObject import ExternalJsObject
 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
@@ -156,7 +156,7 @@
         @return path of the scripts directory
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "greasemonkey")
+        return os.path.join(EricUtilities.getConfigDir(), "web_browser", "greasemonkey")
 
     def requireScriptsDirectory(self):
         """
@@ -360,7 +360,7 @@
 
         self.__jsObject.setSettingsFile(
             os.path.join(
-                Globals.getConfigDir(), "web_browser", "greasemonkey_values.ini"
+                EricUtilities.getConfigDir(), "web_browser", "greasemonkey_values.ini"
             )
         )
         ExternalJsObject.registerExtraObject("GreaseMonkey", self.__jsObject)

--- a/src/eric7/WebBrowser/History/HistoryManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/History/HistoryManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -26,7 +26,7 @@
     pyqtSlot,
 )
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import EricUtilities, Preferences, Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
 
@@ -459,7 +459,7 @@
         @return name of the history file
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "history")
+        return os.path.join(EricUtilities.getConfigDir(), "web_browser", "history")
 
     def reload(self):
         """

--- a/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/Network/ProtocolHandlerManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -14,7 +14,7 @@
 from PyQt6.QtCore import QObject, QUrl
 from PyQt6.QtWebEngineCore import QWebEnginePage
 
-from eric7 import Globals
+from eric7 import EricUtilities
 
 
 class ProtocolHandlerManager(QObject):
@@ -93,7 +93,7 @@
         @rtype str
         """
         return os.path.join(
-            Globals.getConfigDir(), "web_browser", "protocol_handlers.json"
+            EricUtilities.getConfigDir(), "web_browser", "protocol_handlers.json"
         )
 
     def __load(self):

--- a/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/OpenSearch/OpenSearchManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -14,7 +14,7 @@
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt6.QtWidgets import QInputDialog, QLineEdit
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
 from eric7.Utilities.AutoSaver import AutoSaver
@@ -467,7 +467,9 @@
         @return directory name
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "searchengines")
+        return os.path.join(
+            EricUtilities.getConfigDir(), "web_browser", "searchengines"
+        )
 
     def __confirmAddition(self, engine):
         """

--- a/src/eric7/WebBrowser/Passwords/PasswordManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/Passwords/PasswordManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -20,7 +20,7 @@
 from PyQt6.QtWebEngineCore import QWebEngineScript
 from PyQt6.QtWidgets import QApplication
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricProgressDialog import EricProgressDialog
 from eric7.Utilities import crypto
@@ -156,7 +156,7 @@
         @return name of the passwords file
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "logins.xml")
+        return os.path.join(EricUtilities.getConfigDir(), "web_browser", "logins.xml")
 
     def save(self):
         """

--- a/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/SafeBrowsing/SafeBrowsingManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -27,7 +27,7 @@
     pyqtSlot,
 )
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.SystemUtilities import OSUtilities
 from eric7.UI.NotificationWidget import NotificationTypes
@@ -68,7 +68,7 @@
             self.__apiClient = None
 
         gsbCachePath = os.path.join(
-            Globals.getConfigDir(), "web_browser", "safe_browsing"
+            EricUtilities.getConfigDir(), "web_browser", "safe_browsing"
         )
         self.__cache = SafeBrowsingCache(gsbCachePath, self)
 

--- a/src/eric7/WebBrowser/Session/SessionManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/Session/SessionManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -38,7 +38,7 @@
     QVBoxLayout,
 )
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricCore import EricFileSystemWatcher
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor
 from eric7.EricWidgets import EricMessageBox
@@ -130,7 +130,7 @@
         @return name of the sessions directory
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "sessions")
+        return os.path.join(EricUtilities.getConfigDir(), "web_browser", "sessions")
 
     def defaultSessionFile(self):
         """

--- a/src/eric7/WebBrowser/SpeedDial/SpeedDial.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/SpeedDial/SpeedDial.py	Wed Sep 25 14:48:57 2024 +0200
@@ -19,7 +19,7 @@
     qWarning,
 )
 
-from eric7 import Globals, Utilities
+from eric7 import EricUtilities, Utilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
 
@@ -158,14 +158,16 @@
         @return name of the user agents file
         @rtype str
         """
-        return os.path.join(Globals.getConfigDir(), "web_browser", "speedDial.xml")
+        return os.path.join(
+            EricUtilities.getConfigDir(), "web_browser", "speedDial.xml"
+        )
 
     def __initialize(self):
         """
         Private method to initialize the speed dial.
         """
         self.__thumbnailsDirectory = os.path.join(
-            Globals.getConfigDir(), "web_browser", "thumbnails"
+            EricUtilities.getConfigDir(), "web_browser", "thumbnails"
         )
         # Create directory if it does not exist yet
         if not os.path.exists(self.__thumbnailsDirectory):

--- a/src/eric7/WebBrowser/TabManager/TabManagerWidget.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/TabManager/TabManagerWidget.py	Wed Sep 25 14:48:57 2024 +0200
@@ -27,7 +27,7 @@
     QWidget,
 )
 
-from eric7 import Globals, Preferences
+from eric7 import EricUtilities, Preferences
 from eric7.EricGui import EricPixmapCache
 from eric7.EricNetwork import EricNetworkUtilities, EricTldExtractor
 from eric7.EricWidgets.EricApplication import ericApp
@@ -104,7 +104,7 @@
         if TabManagerWidget._tldExtractor is None:
             TabManagerWidget._tldExtractor = EricTldExtractor.instance()
             TabManagerWidget._tldExtractor.setDataSearchPaths(
-                [os.path.join(Globals.getConfigDir(), "web_browser")]
+                [os.path.join(EricUtilities.getConfigDir(), "web_browser")]
             )
 
         self.__tree.itemDoubleClicked.connect(self.__itemDoubleClicked)

--- a/src/eric7/WebBrowser/UserAgent/UserAgentManager.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/UserAgent/UserAgentManager.py	Wed Sep 25 14:48:57 2024 +0200
@@ -11,7 +11,7 @@
 
 from PyQt6.QtCore import QObject, QXmlStreamReader, pyqtSignal
 
-from eric7 import Globals
+from eric7 import EricUtilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.Utilities.AutoSaver import AutoSaver
 
@@ -52,7 +52,7 @@
         @rtype str
         """
         return os.path.join(
-            Globals.getConfigDir(), "web_browser", "userAgentSettings.xml"
+            EricUtilities.getConfigDir(), "web_browser", "userAgentSettings.xml"
         )
 
     def save(self):

--- a/src/eric7/WebBrowser/WebBrowserWindow.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py	Wed Sep 25 14:48:57 2024 +0200
@@ -63,7 +63,7 @@
 except ImportError:
     QTHELP_AVAILABLE = False
 
-from eric7 import Globals, Preferences, Utilities
+from eric7 import EricUtilities, Preferences, Utilities
 from eric7.__version__ import Version
 from eric7.EricGui import EricPixmapCache
 from eric7.EricGui.EricAction import EricAction
@@ -537,7 +537,7 @@
         """
         if enable:
             iconDatabasePath = os.path.join(
-                Globals.getConfigDir(), "web_browser", "favicons"
+                EricUtilities.getConfigDir(), "web_browser", "favicons"
             )
             if not os.path.exists(iconDatabasePath):
                 os.makedirs(iconDatabasePath)
@@ -2905,7 +2905,7 @@
         applPath = os.path.join(getConfig("ericDir"), "eric7_browser.py")
         args = []
         args.append(applPath)
-        args.append("--config={0}".format(Globals.getConfigDir()))
+        args.append("--config={0}".format(EricUtilities.getConfigDir()))
         if self.__settingsDir:
             args.append("--settings={0}".format(self.__settingsDir))
         args.append("--private")
@@ -3844,7 +3844,7 @@
         @return path of the QtHelp collection file
         @rtype str
         """
-        qthelpDir = os.path.join(Globals.getConfigDir(), "qthelp")
+        qthelpDir = os.path.join(EricUtilities.getConfigDir(), "qthelp")
         if not os.path.exists(qthelpDir):
             os.makedirs(qthelpDir)
         return os.path.join(qthelpDir, "eric7help.qhc")
@@ -5399,7 +5399,7 @@
                         Preferences.getWebBrowser("DiskCacheSize") * 1024 * 1024
                     )
                     cls._webProfile.setCachePath(
-                        os.path.join(Globals.getConfigDir(), "web_browser")
+                        os.path.join(EricUtilities.getConfigDir(), "web_browser")
                     )
                 else:
                     cls._webProfile.setHttpCacheType(
@@ -5408,7 +5408,7 @@
                     cls._webProfile.setHttpCacheMaximumSize(0)
                 cls._webProfile.setPersistentStoragePath(
                     os.path.join(
-                        Globals.getConfigDir(), "web_browser", "persistentstorage"
+                        EricUtilities.getConfigDir(), "web_browser", "persistentstorage"
                     )
                 )
                 cls._webProfile.setPersistentCookiesPolicy(

--- a/src/eric7/eric7_browser.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_browser.py	Wed Sep 25 14:48:57 2024 +0200
@@ -17,12 +17,12 @@
 
 from PyQt6.QtGui import QGuiApplication
 
-from eric7 import Globals
+from eric7 import EricUtilities
 from eric7.WebBrowser.WebBrowserArgumentsCreator import createArgparseNamespace
 
 args = createArgparseNamespace()
 if args.config:
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_compare.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_compare.py	Wed Sep 25 14:48:57 2024 +0200
@@ -73,9 +73,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_configure.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_configure.py	Wed Sep 25 14:48:57 2024 +0200
@@ -58,9 +58,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_diff.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_diff.py	Wed Sep 25 14:48:57 2024 +0200
@@ -72,9 +72,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_editor.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_editor.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_fido2.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_fido2.py	Wed Sep 25 14:48:57 2024 +0200
@@ -62,9 +62,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_hexeditor.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_hexeditor.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_iconeditor.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_iconeditor.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_ide.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_ide.py	Wed Sep 25 14:48:57 2024 +0200
@@ -191,14 +191,14 @@
 inMainLoop = False
 app = None
 
-from eric7 import Globals
+from eric7 import EricUtilities
 
 if args.config:
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 
 if args.debug:
     logging.basicConfig(
-        filename=os.path.join(Globals.getConfigDir(), "eric7_debug.txt"),
+        filename=os.path.join(EricUtilities.getConfigDir(), "eric7_debug.txt"),
         filemode="w",
         format="[%(asctime)s] %(levelname)s: %(name)s:%(lineno)d - %(message)s",
         level=logging.DEBUG,
@@ -246,7 +246,7 @@
     @param tracebackobj traceback object
     @type Traceback
     """
-    from eric7 import Globals, Utilities
+    from eric7 import EricUtilities, Utilities
     from eric7.UI.Info import BugAddress
 
     # Workaround for a strange issue with QScintilla
@@ -254,7 +254,7 @@
         return
 
     separator = "-" * 80
-    logFile = os.path.join(Globals.getConfigDir(), "eric7_error.log")
+    logFile = os.path.join(EricUtilities.getConfigDir(), "eric7_error.log")
     notice = (
         """An unhandled exception occurred. Please report the problem\n"""
         """using the error reporting dialog or via email to <{0}>.\n"""

--- a/src/eric7/eric7_mpy.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_mpy.py	Wed Sep 25 14:48:57 2024 +0200
@@ -59,9 +59,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_pdf.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_pdf.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_pip.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_pip.py	Wed Sep 25 14:48:57 2024 +0200
@@ -60,9 +60,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_plugininstall.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_plugininstall.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_pluginrepository.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_pluginrepository.py	Wed Sep 25 14:48:57 2024 +0200
@@ -60,9 +60,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_pluginuninstall.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_pluginuninstall.py	Wed Sep 25 14:48:57 2024 +0200
@@ -59,9 +59,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_qregularexpression.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_qregularexpression.py	Wed Sep 25 14:48:57 2024 +0200
@@ -61,9 +61,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_re.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_re.py	Wed Sep 25 14:48:57 2024 +0200
@@ -61,9 +61,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_shell.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_shell.py	Wed Sep 25 14:48:57 2024 +0200
@@ -62,9 +62,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_snap.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_snap.py	Wed Sep 25 14:48:57 2024 +0200
@@ -60,9 +60,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_sqlbrowser.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_sqlbrowser.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_testing.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_testing.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_tray.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_tray.py	Wed Sep 25 14:48:57 2024 +0200
@@ -60,9 +60,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_trpreviewer.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_trpreviewer.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_uipreviewer.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_uipreviewer.py	Wed Sep 25 14:48:57 2024 +0200
@@ -65,9 +65,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings
 

--- a/src/eric7/eric7_virtualenv.py	Wed Sep 25 14:07:40 2024 +0200
+++ b/src/eric7/eric7_virtualenv.py	Wed Sep 25 14:48:57 2024 +0200
@@ -60,9 +60,9 @@
 
 args = createArgparseNamespace()
 if args.config:
-    from eric7 import Globals
+    from eric7 import EricUtilities
 
-    Globals.setConfigDir(args.config)
+    EricUtilities.setConfigDir(args.config)
 if args.settings:
     from PyQt6.QtCore import QSettings