diff -r 29feb4027695 -r 75908476226e scripts/uninstall.py
--- a/scripts/uninstall.py Thu May 20 19:22:05 2021 +0200
+++ b/scripts/uninstall.py Thu May 20 19:52:44 2021 +0200
@@ -24,7 +24,7 @@
progLanguages = ["Python", "Ruby", "QSS"]
defaultMacAppBundleName = "eric7.app"
defaultMacAppBundlePath = "/Applications"
-settingsNameOrganization = "Eric6"
+settingsNameOrganization = "Eric7"
settingsNameGlobal = "eric7"
@@ -132,8 +132,6 @@
"eric7_pluginrepository", "eric7_sqlbrowser",
"eric7_iconeditor", "eric7_snap", "eric7_hexeditor",
"eric7_browser", "eric7_shell",
- # from Python2 era
- "eric7_webbrowser",
]
try:
@@ -257,8 +255,6 @@
"/usr/share/pixmaps/ericWeb.png",
"/usr/share/icons/eric.png",
"/usr/share/icons/ericWeb.png",
- # from Python2 era
- "/usr/share/applications/eric7_webbrowser.desktop",
]:
if os.path.exists(name):
os.remove(name)
@@ -273,8 +269,6 @@
"~/.local/share/pixmaps/ericWeb.png",
"~/.local/share/icons/eric.png",
"~/.local/share/icons/ericWeb.png",
- # from Python2 era
- "/usr/share/applications/eric7_webbrowser.desktop",
]:
path = os.path.expanduser(name)
if os.path.exists(path):
@@ -285,8 +279,8 @@
"""
Uninstall the macOS application bundle.
"""
- if os.path.exists("/Developer/Applications/Eric6"):
- shutil.rmtree("/Developer/Applications/Eric6")
+ if os.path.exists("/Developer/Applications/Eric7"):
+ shutil.rmtree("/Developer/Applications/Eric7")
try:
macAppBundlePath = getConfig("macAppBundlePath")
macAppBundleName = getConfig("macAppBundleName")
@@ -356,7 +350,7 @@
print("cannot be determined. You have to remove it manually.\n")
return
- settings = QSettings(QSettings.IniFormat, QSettings.UserScope,
+ settings = QSettings(QSettings.Format.IniFormat, QSettings.Scope.UserScope,
settingsNameOrganization, settingsNameGlobal)
settingsDir = os.path.dirname(settings.fileName())
if os.path.exists(settingsDir):
