eric: comparison scripts/install.py

-:aa713ac50c0d
+:cc717c2ae956
 global currDir
 print()
 if sys.platform.startswith(("win", "cygwin")):
-try:
+with contextlib.suppress():
 input("Press enter to continue...")             # secok
-except (EOFError, SyntaxError):
-pass
 os.chdir(currDir)
 sys.exit(rcode)
 os.path.join(getConfig('ericTranslationsDir'), 'eric6_*.qm')):
 if os.path.exists(name):
 os.remove(name)
 # Cleanup API files
-try:
+with contextlib.suppress(AttributeError):
 apidir = getConfig('apidir')
 for progLanguage in progLanguages:
 for name in getConfig('apis'):
 apiname = os.path.join(apidir, progLanguage.lower(), name)
 if os.path.exists(apiname):
 os.remove(apiname)
 for apiname in glob.glob(
 os.path.join(apidir, progLanguage.lower(), "*.bas")):
 if os.path.basename(apiname) != "eric6.bas":
 os.remove(apiname)
-except AttributeError:
-pass
 if sys.platform == "darwin":
 # delete the Mac app bundle
 cleanUpMacAppBundle()
 except OSError as msg:
 try:
 from PyQt5.QtCore import qVersion
 except ImportError as msg:
 installed = not isSudo and pipInstall(
-"PyQt5>=5.12.1,<5.15.2",
+"PyQt5>=5.12.1",
 "'PyQt5' could not be detected.\nError: {0}".format(msg)
 )
 if installed:
 # try to import it again
 try:
 # PyQt 5.12 separated QtWebEngine into a separate wheel
 if isSudo:
 print("Optional 'PyQtWebEngine' could not be detected.")
 else:
 pipInstall(
-"PyQtWebEngine>=5.12.1,<5.15.2",
+"PyQtWebEngine>=5.12.1",
 "Optional 'PyQtWebEngine' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
 except ImportError as msg:
 if isSudo:
 print("Optional 'PyQtChart' could not be detected.")
 else:
 pipInstall(
-"PyQtChart>=5.12.1,<5.15.2",
+"PyQtChart>=5.12.1",
 "Optional 'PyQtChart' could not be detected.\n"
 "Error: {0}".format(msg)
 )
 try:
 altModulesOK = True
 for altModules, forcedOk in altModulesList:
 modulesOK = False
 for altModule in altModules:
 name = altModule.split(".")[1]
-try:
+with contextlib.suppress(ImportError):
 __import__(altModule)
 print("Found", name)
 modulesOK = True
 break
-except ImportError:
-pass
 if not modulesOK and not forcedOk:
 altModulesOK = False
 print('Sorry, please install {0}.'
 .format(" or ".join(altModules)))
 if not altModulesOK:
 if qtMajor == 5 and qtMinor < 12:
 print('Sorry, you must have Qt version 5.12.0 or better.')
 exit(2)
 # check version of sip
-try:
+with contextlib.suppress(ImportError, AttributeError):
 try:
 from PyQt5 import sip
 except ImportError:
 import sip
 sipVersion = sip.SIP_VERSION_STR
 (major, minor, pat) = sipVersion.split('.')
 major = int(major)
 minor = int(minor)
 pat = int(pat)
 if (
-major < 4 or
+major < 5 or
-(major == 4 and minor < 14) or
+(major == 5 and minor < 0) or
-(major == 4 and minor == 14 and pat < 2)
+(major == 5 and minor == 0 and pat < 0)
 ):
-print('Sorry, you must have sip 4.14.2 or higher or'
+print('Sorry, you must have sip 5.0.0 or higher or'
 ' a recent snapshot release.')
 exit(3)
 # check for blacklisted versions
 for vers in BlackLists["sip"] + PlatformBlackLists["sip"]:
 if vers == sipVersion:
 print(
 'Sorry, sip version {0} is not compatible with eric.'
 .format(vers))
 print('Please install another version.')
 exit(3)
-except (ImportError, AttributeError):
-pass
 # check version of PyQt
 from PyQt5.QtCore import PYQT_VERSION_STR
 pyqtVersion = PYQT_VERSION_STR
 print("PyQt Version:", pyqtVersion.strip())
 ' eric.'.format(vers))
 print('Please install another version.')
 exit(5)
 # print version info for additional modules
-try:
+with contextlib.suppress(NameError, AttributeError):
 print("PyQtChart:", QtChart.PYQT_CHART_VERSION_STR)
-except (NameError, AttributeError):
-pass
+with contextlib.suppress(ImportError, AttributeError):
-try:
 from PyQt5 import QtWebEngine
 print("PyQtWebEngine.", QtWebEngine.PYQT_WEBENGINE_VERSION_STR)
-except (ImportError, AttributeError):
-pass
 print("All dependencies ok.")
 print()
 @type str
 """
 from win32com.client import Dispatch
 from pywintypes import com_error
-try:
+with contextlib.suppress(com_error):
 shell = Dispatch('WScript.Shell')
 shortcut = shell.CreateShortCut(linkPath)
 shortcut.Targetpath = targetPath
 shortcut.WorkingDirectory = os.path.dirname(targetPath)
 shortcut.IconLocation = iconPath
 shortcut.save()
-except com_error:
-# maybe restrictions prohibited link creation
-pass
 def windowsDesktopNames():
 """
 Function to generate the link names for the Windows Desktop.
 if len(cfg) == 0:
 createInstallConfig()
 # get rid of development config file, if it exists
-try:
+with contextlib.suppress(OSError):
 if installFromSource:
 os.rename(configName, configName + ".orig")
 configNameC = configName + 'c'
 if os.path.exists(configNameC):
 os.remove(configNameC)
 os.remove(configName)
-except OSError:
-pass
 # cleanup old installation
 print("Cleaning up old installation ...")
 try:
 if doCleanup:

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py