eric: comparison scripts/uninstall.py

-:eaf2cf171f3a
+:5cf645f6daab
 import os
 import shutil
 import glob
 import distutils.sysconfig
-if sys.version_info[0] == 2:
-try:
-from PyQt5 import sip
-except ImportError:
-import sip
-sip.setapi('QString', 2)
-else:
-raw_input = input
 # Define the globals.
 progName = None
 currDir = os.getcwd()
 pyModDir = None
 progLanguages = ["Python", "Ruby", "QSS"]
-includePythonVariant = False
 defaultMacAppBundleName = "eric6.app"
 defaultMacAppBundlePath = "/Applications"
 settingsNameOrganization = "Eric6"
 settingsNameGlobal = "eric6"
-# Define file name markers for Python variants
-PythonMarkers = {
-2: "_py2",
-3: "_py3",
-}
 def exit(rcode=0):
 """
 Exit the uninstall script.
 if os.path.exists("eric6config.py"):
 os.remove("eric6config.py")
 os.rename("eric6config.py.orig", "eric6config.py")
 if sys.platform.startswith(("win", "cygwin")):
-# different meaning of input between Py2 and Py3
 try:
 input("Press enter to continue...")
 except (EOFError, SyntaxError):
 pass
 print("Usage:")
 print("    {0} [-h]".format(progName))
 print("where:")
 print("    -h             display this help message")
-print("    -y             remove executables with Python variant in name")
 exit(rcode)
 def initGlobals():
 "eric6_trpreviewer", "eric6_uipreviewer",
 "eric6_unittest", "eric6",
 "eric6_tray", "eric6_editor",
 "eric6_plugininstall", "eric6_pluginuninstall",
 "eric6_pluginrepository", "eric6_sqlbrowser",
-"eric6_webbrowser", "eric6_iconeditor",
+"eric6_iconeditor", "eric6_snap", "eric6_hexeditor",
-"eric6_snap", "eric6_hexeditor", "eric6_browser",
+"eric6_browser", "eric6_shell",
-"eric6_shell",
+# from Python2 era
+"eric6_webbrowser",
 ]
-if includePythonVariant:
-marker = PythonMarkers[sys.version_info.major]
-rem_wnames = [n + marker for n in rem_wnames]
 try:
 for rem_wname in rem_wnames:
 for rwname in wrapperNames(getConfig('bindir'), rem_wname):
 if os.path.exists(rwname):
 if os.getuid() == 0:
 for name in ["/usr/share/pixmaps/eric.png",
 "/usr/share/pixmaps/ericWeb.png"]:
 if os.path.exists(name):
 os.remove(name)
-if includePythonVariant:
-marker = PythonMarkers[sys.version_info.major]
-else:
-marker = ""
 for name in [
-"/usr/share/applications/eric6" + marker + ".desktop",
+"/usr/share/applications/eric6.desktop",
-"/usr/share/appdata/eric6" + marker + ".appdata.xml",
+"/usr/share/appdata/eric6.appdata.xml",
-"/usr/share/metainfo/eric6" + marker + ".appdata.xml",
+"/usr/share/metainfo/eric6.appdata.xml",
-"/usr/share/applications/eric6_webbrowser" + marker +
+"/usr/share/applications/eric6_browser.desktop",
-".desktop",
+"/usr/share/pixmaps/eric.png",
-"/usr/share/applications/eric6_browser" + marker +
+"/usr/share/pixmaps/ericWeb.png",
-".desktop",
+# from Python2 era
-"/usr/share/pixmaps/eric" + marker + ".png",
+"/usr/share/applications/eric6_webbrowser.desktop",
-"/usr/share/pixmaps/ericWeb" + marker + ".png",
 ]:
 if os.path.exists(name):
 os.remove(name)
 elif os.getuid() >= 1000:
 # it is assumed that user ids start at 1000
 for name in ["~/.local/share/pixmaps/eric.png",
 "~/.local/share/pixmaps/ericWeb.png"]:
 path = os.path.expanduser(name)
 if os.path.exists(path):
 os.remove(path)
-if includePythonVariant:
-marker = PythonMarkers[sys.version_info.major]
-else:
-marker = ""
 for name in [
-"~/.local/share/applications/eric6" + marker + ".desktop",
+"~/.local/share/applications/eric6.desktop",
-"~/.local/share/appdata/eric6" + marker + ".appdata.xml",
+"~/.local/share/appdata/eric6.appdata.xml",
-"~/.local/share/metainfo/eric6" + marker + ".appdata.xml",
+"~/.local/share/metainfo/eric6.appdata.xml",
-"~/.local/share/applications/eric6_webbrowser" + marker +
+"~/.local/share/applications/eric6_browser.desktop",
-".desktop",
+"~/.local/share/pixmaps/eric.png",
-"~/.local/share/applications/eric6_browser" + marker +
+"~/.local/share/pixmaps/ericWeb.png",
-".desktop",
+# from Python2 era
-"~/.local/share/pixmaps/eric" + marker + ".png",
+"/usr/share/applications/eric6_webbrowser.desktop",
-"~/.local/share/pixmaps/ericWeb" + marker + ".png",
 ]:
 path = os.path.expanduser(name)
 if os.path.exists(path):
 os.remove(path)
 print("Found these plug-in directories")
 for path in pathsToRemove:
 print("  - {0}".format(path))
 answer = "c"
 while answer not in ["y", "Y", "n", "N", ""]:
-answer = raw_input(
+answer = input("Shall these directories be removed (y/N)? ")
-"Shall these directories be removed (y/N)? ")
 if answer in ["y", "Y"]:
 for path in pathsToRemove:
 shutil.rmtree(path)
 if os.path.exists(cfg):
 print("Found the eric data directory")
 print("  - {0}".format(cfg))
 answer = "c"
 while answer not in ["y", "Y", "n", "N", ""]:
-answer = raw_input(
+answer = input("Shall this directory be removed (y/N)? ")
-"Shall this directory be removed (y/N)? ")
 if answer in ["y", "Y"]:
 shutil.rmtree(cfg)
 def removeConfigurationData():
 Remove the eric configuration directory.
 """
 try:
 from PyQt5.QtCore import QSettings
 except ImportError:
-try:
+print("No PyQt variant installed. The configuration directory")
-from PyQt4.QtCore import QSettings
+print("cannot be determined. You have to remove it manually.\n")
-except ImportError:
+return
-print("No PyQt variant installed. The configuration directory")
-print("cannot be determined. You have to remove it manually.\n")
-return
 settings = QSettings(QSettings.IniFormat, QSettings.UserScope,
 settingsNameOrganization, settingsNameGlobal)
 settingsDir = os.path.dirname(settings.fileName())
 if os.path.exists(settingsDir):
 print("Found the eric configuration directory")
 print("  - {0}".format(settingsDir))
 answer = "c"
 while answer not in ["y", "Y", "n", "N", ""]:
-answer = raw_input(
+answer = input("Shall this directory be removed (y/N)? ")
-"Shall this directory be removed (y/N)? ")
 if answer in ["y", "Y"]:
 shutil.rmtree(settingsDir)
 def getConfigDir():
 @param argv list of command line arguments
 """
 import getopt
-global includePythonVariant
 initGlobals()
 # Parse the command line.
 global progName
 progName = os.path.basename(argv[0])
 global platBinDir
 for opt, _arg in optlist:
 if opt == "-h":
 usage(0)
-if opt == "-y":
-includePythonVariant = True
 print("\nUninstalling eric6 ...")
 uninstallEric()
 print("\nUninstallation complete.")
 print()

Mercurial Repositories > eric / file comparison

comparison: scripts/uninstall.py

scripts/uninstall.py