Mercurial Repositories > eric / file diff

--- a/eric7/Globals/__init__.py	Sat May 15 19:01:16 2021 +0200
+++ b/eric7/Globals/__init__.py	Sat May 15 20:08:03 2021 +0200
@@ -21,12 +21,12 @@
     QDir, QByteArray, QCoreApplication, QT_VERSION, QProcess, qVersion
 )
 
-from eric6config import getConfig
+from eric7config import getConfig
 
 # names of the various settings objects
 settingsNameOrganization = "Eric6"
-settingsNameGlobal = "eric6"
-settingsNameRecent = "eric6recent"
+settingsNameGlobal = "eric7"
+settingsNameRecent = "eric7recent"
 
 # key names of the various recent entries
 recentNameMultiProject = "MultiProjects"
@@ -199,10 +199,10 @@
     if configDir is not None and os.path.exists(configDir):
         hp = configDir
     else:
-        cdn = ".eric6"
+        cdn = ".eric7"
         if isWindowsPlatform():
             # migrate the old config directory (< v18.06)
-            cdnOld = "_eric6"
+            cdnOld = "_eric7"
             hpOld = os.path.join(os.path.expanduser("~"), cdnOld)
             if os.path.exists(hpOld):
                 hpNew = os.path.join(os.path.expanduser("~"), cdn)
@@ -225,7 +225,7 @@
     @return file path of the install info file
     @rtype str
     """
-    filename = "eric6install.{0}.json".format(
+    filename = "eric7install.{0}.json".format(
         getConfig("ericDir")
         .replace(":", "_")
         .replace("\\", "_")
@@ -546,7 +546,7 @@
         or "None")
     @rtype str
     """
-    from eric6config import getConfig
+    from eric7config import getConfig
     scriptPath = os.path.join(getConfig("ericDir"), "Tools",
                               "webBrowserSupport.py")
     proc = QProcess()