Mercurial Repositories > eric / changeset

--- a/scripts/create_windows_links.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/scripts/create_windows_links.py	Mon Oct 31 13:52:10 2022 +0100
@@ -13,7 +13,7 @@
 import sys
 import contextlib
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 def main(argv):

--- a/scripts/install-i18n.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/scripts/install-i18n.py	Mon Oct 31 13:52:10 2022 +0100
@@ -15,7 +15,7 @@
 import sys
 
 try:
-    from eric7config import getConfig
+    from eric7.Globals import getConfig
 except ImportError:
     print("The eric IDE doesn't seem to be installed. Aborting.")
     sys.exit(1)

--- a/scripts/install.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/scripts/install.py	Mon Oct 31 13:52:10 2022 +0100
@@ -482,7 +482,7 @@
     global platBinDir
 
     try:
-        from eric7config import getConfig
+        from eric7.Globals import getConfig
     except ImportError:
         # eric wasn't installed previously
         return
@@ -648,7 +648,7 @@
     """
     Uninstall the macOS application bundle.
     """
-    from eric7config import getConfig
+    from eric7.Globals import getConfig
 
     try:
         macAppBundlePath = getConfig("macAppBundlePath")

--- a/scripts/uninstall.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/scripts/uninstall.py	Mon Oct 31 13:52:10 2022 +0100
@@ -55,7 +55,7 @@
 if os.path.exists("eric7config.py"):
     os.rename("eric7config.py", "eric7config.py.orig")
 try:
-    from eric7config import getConfig
+    from eric7.Globals import getConfig
 except ImportError:
     print("The eric IDE doesn't seem to be installed. Aborting.")
     exit(1)

--- a/src/eric7/DebugClients/Python/eric7dbgstub.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/DebugClients/Python/eric7dbgstub.py	Mon Oct 31 13:52:10 2022 +0100
@@ -11,7 +11,7 @@
 import sys
 import sysconfig
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 debugger = None
 __scriptname = None

--- a/src/eric7/Debugger/DebuggerInterfacePython.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Debugger/DebuggerInterfacePython.py	Mon Oct 31 13:52:10 2022 +0100
@@ -21,7 +21,7 @@
 
 from eric7 import Globals, Preferences, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 ClientDefaultCapabilities = DebugClientCapabilities.HasAll

--- a/src/eric7/EricWidgets/EricApplication.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/EricWidgets/EricApplication.py	Mon Oct 31 13:52:10 2022 +0100
@@ -189,7 +189,7 @@
         @rtype str
         """
         from eric7 import Preferences, Utilities
-        from eric7config import getConfig
+        from eric7.Globals import getConfig
 
         styleIconsPath = Preferences.getUI("StyleIconsPath")
         if not styleIconsPath:

--- a/src/eric7/Globals/__init__.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Globals/__init__.py	Mon Oct 31 13:52:10 2022 +0100
@@ -27,7 +27,10 @@
     qVersion,
 )
 
-from eric7config import getConfig
+try:
+    from eric7.eric7config import getConfig
+except ImportError:
+    from eric7config import getConfig
 
 # names of the various settings objects
 settingsNameOrganization = "Eric7"
@@ -616,7 +619,10 @@
         or "None")
     @rtype str
     """
-    from eric7config import getConfig
+    try:
+        from eric7.eric7config import getConfig
+    except ImportError:
+        from eric7config import getConfig
 
     scriptPath = os.path.join(getConfig("ericDir"), "Tools", "webBrowserSupport.py")
     proc = QProcess()

--- a/src/eric7/PluginManager/PluginManager.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/PluginManager/PluginManager.py	Mon Oct 31 13:52:10 2022 +0100
@@ -48,7 +48,7 @@
 
 from eric7 import Globals, Preferences, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class PluginManager(QObject):

--- a/src/eric7/PluginManager/PluginRepositoryDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/PluginManager/PluginRepositoryDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -64,7 +64,7 @@
 
 from eric7.EricGui import EricPixmapCache
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class PluginRepositoryWidget(QWidget, Ui_PluginRepositoryDialog):

--- a/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -19,7 +19,7 @@
 
 from eric7 import DocumentationTools, Globals, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class EricapiConfigDialog(QDialog, Ui_EricapiConfigDialog):

--- a/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -24,7 +24,7 @@
 
 from eric7 import Globals, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class EricdocConfigDialog(QDialog, Ui_EricdocConfigDialog):

--- a/src/eric7/Plugins/PluginEricapi.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/PluginEricapi.py	Mon Oct 31 13:52:10 2022 +0100
@@ -19,7 +19,7 @@
 from eric7 import Utilities
 from eric7.UI import Info
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 # Start-Of-Header
 name = "Ericapi Plugin"

--- a/src/eric7/Plugins/PluginEricdoc.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/PluginEricdoc.py	Mon Oct 31 13:52:10 2022 +0100
@@ -19,7 +19,7 @@
 from eric7 import Utilities
 from eric7.UI import Info
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 # Start-Of-Header
 name = "Ericdoc Plugin"

--- a/src/eric7/Plugins/PluginSyntaxChecker.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/PluginSyntaxChecker.py	Mon Oct 31 13:52:10 2022 +0100
@@ -14,7 +14,7 @@
 
 from eric7.EricGui.EricAction import EricAction
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 from eric7.Project.ProjectBrowserModel import ProjectBrowserFileItem
 

--- a/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Mon Oct 31 13:52:10 2022 +0100
@@ -46,7 +46,7 @@
 from eric7 import Preferences
 from eric7.Globals import isMacPlatform
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class TabBar(EricWheelTabBar):

--- a/src/eric7/Preferences/ConfigurationDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -44,7 +44,7 @@
 
 from eric7.EricGui import EricPixmapCache
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class ConfigurationPageItem(QTreeWidgetItem):

--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Mon Oct 31 13:52:10 2022 +0100
@@ -540,7 +540,7 @@
             (defaults to False)
         @type bool (optional)
         """
-        from eric7config import getConfig
+        from eric7.Globals import getConfig
 
         stylesDir = getConfig("ericStylesDir")
 
@@ -610,7 +610,7 @@
             (defaults to False)
         @type bool (optional)
         """
-        from eric7config import getConfig
+        from eric7.Globals import getConfig
 
         stylesDir = getConfig("ericStylesDir")
 

--- a/src/eric7/Preferences/ConfigurationPages/IconsPage.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/IconsPage.py	Mon Oct 31 13:52:10 2022 +0100
@@ -20,7 +20,7 @@
 
 from eric7 import Preferences
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class IconsPage(ConfigurationPageBase, Ui_IconsPage):

--- a/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/InterfaceLightPage.py	Mon Oct 31 13:52:10 2022 +0100
@@ -21,7 +21,7 @@
 
 from eric7 import Preferences, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class InterfaceLightPage(ConfigurationPageBase, Ui_InterfaceLightPage):

--- a/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/InterfacePage.py	Mon Oct 31 13:52:10 2022 +0100
@@ -23,7 +23,7 @@
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class InterfacePage(ConfigurationPageBase, Ui_InterfacePage):

--- a/src/eric7/Preferences/ThemeManager.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Preferences/ThemeManager.py	Mon Oct 31 13:52:10 2022 +0100
@@ -17,7 +17,7 @@
 
 from eric7 import Globals, Preferences
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class ThemeManager(QObject):

--- a/src/eric7/Project/CreateDialogCodeDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Project/CreateDialogCodeDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -30,7 +30,7 @@
 from .Ui_CreateDialogCodeDialog import Ui_CreateDialogCodeDialog
 from .NewDialogClassDialog import NewDialogClassDialog
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 from eric7 import Globals, Preferences
 

--- a/src/eric7/Project/DebuggerPropertiesDialog.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Project/DebuggerPropertiesDialog.py	Mon Oct 31 13:52:10 2022 +0100
@@ -19,7 +19,7 @@
 from .Ui_DebuggerPropertiesDialog import Ui_DebuggerPropertiesDialog
 
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 from eric7 import Preferences
 from eric7.EricGui import EricPixmapCache

--- a/src/eric7/Project/ProjectFormsBrowser.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Project/ProjectFormsBrowser.py	Mon Oct 31 13:52:10 2022 +0100
@@ -34,7 +34,7 @@
 
 from eric7 import Preferences, Utilities
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class ProjectFormsBrowser(ProjectBaseBrowser):

--- a/src/eric7/QScintilla/ShellWindow.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/QScintilla/ShellWindow.py	Mon Oct 31 13:52:10 2022 +0100
@@ -33,7 +33,7 @@
 from eric7.UI.SearchWidget import SearchWidget
 from eric7.VirtualEnv.VirtualenvManager import VirtualenvManager
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class ShellWindow(EricMainWindow):

--- a/src/eric7/Toolbox/Startup.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Toolbox/Startup.py	Mon Oct 31 13:52:10 2022 +0100
@@ -19,7 +19,7 @@
 
 from eric7.EricGui import EricPixmapCache
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 application = None
 

--- a/src/eric7/UI/Previewers/PreviewerQSS.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/UI/Previewers/PreviewerQSS.py	Mon Oct 31 13:52:10 2022 +0100
@@ -20,7 +20,7 @@
 from eric7 import Preferences, Utilities
 from eric7.EricGui import EricPixmapCache
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class PreviewerQSS(QWidget, Ui_PreviewerQSS):

--- a/src/eric7/UI/SplashScreen.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/UI/SplashScreen.py	Mon Oct 31 13:52:10 2022 +0100
@@ -14,7 +14,7 @@
 from PyQt6.QtGui import QPixmap, QColor
 from PyQt6.QtWidgets import QApplication, QSplashScreen
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class SplashScreen(QSplashScreen):

--- a/src/eric7/UI/UserInterface.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/UI/UserInterface.py	Mon Oct 31 13:52:10 2022 +0100
@@ -90,7 +90,7 @@
 except ImportError:
     SSL_AVAILABLE = False
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class Redirector(QObject):

--- a/src/eric7/Utilities/__init__.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/Utilities/__init__.py	Mon Oct 31 13:52:10 2022 +0100
@@ -86,7 +86,7 @@
     normalizeCode,
 )
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 configDir = None
 

--- a/src/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/WebBrowser/QtHelp/HelpDocsInstaller.py	Mon Oct 31 13:52:10 2022 +0100
@@ -14,7 +14,7 @@
 from PyQt6.QtCore import pyqtSignal, QThread, QMutex, QLibraryInfo
 from PyQt6.QtHelp import QHelpEngineCore
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 from eric7.Globals import qVersionTuple
 

--- a/src/eric7/WebBrowser/WebBrowserWindow.py	Mon Oct 31 09:21:46 2022 +0100
+++ b/src/eric7/WebBrowser/WebBrowserWindow.py	Mon Oct 31 13:52:10 2022 +0100
@@ -81,7 +81,7 @@
 
 from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer
 
-from eric7config import getConfig
+from eric7.Globals import getConfig
 
 
 class WebBrowserWindow(EricMainWindow):