eric: comparison scripts/install.py

-:5ea038882dd6
+:c1a2ff7e3575
 def cleanUpWindowsLinks():
 """
 Clean up the Desktop and Start Menu entries for Windows.
 """
-global doCleanDesktopLinks, forceCleanDesktopLinks
+if importlib.util.find_spec("pywintypes") is None:
-try:
-from pywintypes import com_error  # __IGNORE_WARNING__
-except ImportError:
 # links were not created by install.py
 return
+global doCleanDesktopLinks, forceCleanDesktopLinks
 regPath = (
 "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"
 + "\\User Shell Folders"
 )
 def createWindowsLinks():
 """
 Create Desktop and Start Menu links.
 """
-try:
+if importlib.util.find_spec("win32com") is None:
-# check, if pywin32 is available
-from win32com.client import Dispatch  # __IGNORE_WARNING__
-except (ImportError, ModuleNotFoundError):  # noqa: M514
 installed = pipInstall(
 "pywin32",
 "\nThe Python package 'pywin32' could not be imported.",
 force=False,
 )
 if sys.version_info < (3, 8, 0) or sys.version_info >= (3, 13, 0):
 print("Sorry, you must have Python 3.8.0 or higher, but less 3.13.0.")
 print("Yours is {0}.".format(".".join(str(v) for v in sys.version_info[:3])))
 exit(5)
-try:
+if (
-import xml.etree  # __IGNORE_WARNING__
+importlib.util.find_spec("xml") is None
-except ImportError:
+or importlib.util.find_spec("xml.etree") is None
+):
 print("Your Python installation is missing the XML module.")
 print("Please install it and try again.")
 exit(5)
 print("PyQt & Qt")
 print("Sorry, please install PyQt6.")
 print("Error: {0}".format(msg))
 exit(1)
 print("Found PyQt6")
-try:
+pyuic = "pyuic6"
-pyuic = "pyuic6"
+if importlib.util.find_spec("PyQt6.uic") is None:
-from PyQt6 import uic  # __IGNORE_WARNING__
-except ImportError as err:
 print("Sorry, {0} is not installed.".format(pyuic))
-if verbose:
-print("Error: {0}".format(err))
 exit(1)
 print("Found {0}".format(pyuic))
-try:
+if importlib.util.find_spec("PyQt6.QtWebEngineWidgets") is None:
-from PyQt6 import QtWebEngineWidgets  # __IGNORE_WARNING__
-except ImportError as err:
 if isSudo:
 print("Optional 'PyQt6-WebEngine' could not be detected.")
 else:
-msg = "Optional 'PyQt6-WebEngine' could not be detected.{0}".format(
+msg = "Optional 'PyQt6-WebEngine' could not be detected."
-"\nError: {0}".format(err) if verbose else ""
-)
 pipInstall(
 "PyQt6-WebEngine>={0}".format(
 versionToStr(requiredVersions["pyqt6-webengine"])
 ),
 msg,
 )
 print("Found PyQt6-WebEngine")
-try:
+if importlib.util.find_spec("PyQt6.QtCharts") is None:
-from PyQt6 import QtCharts  # __IGNORE_WARNING__
-except ImportError as err:
 if isSudo:
 print("Optional 'PyQt6-Charts' could not be detected.")
 else:
-msg = "Optional 'PyQt6-Charts' could not be detected.{0}".format(
+msg = "Optional 'PyQt6-Charts' could not be detected."
-"\nError: {0}".format(err) if verbose else ""
-)
 pipInstall(
 "PyQt6-Charts>={0}".format(
 versionToStr(requiredVersions["pyqt6-charts"])
 ),
 msg,
 )
 print("Found PyQt6-Charts")
-try:
+if importlib.util.find_spec("PyQt6.Qsci") is None:
-from PyQt6 import Qsci  # __IGNORE_WARNING__
+msg = "'PyQt6-QScintilla' could not be detected."
-except ImportError as err:
-msg = "'PyQt6-QScintilla' could not be detected.{0}".format(
-"\nError: {0}".format(err) if verbose else ""
-)
 installed = not isSudo and pipInstall(
 "PyQt6-QScintilla>={0}".format(
 versionToStr(requiredVersions["pyqt6-qscintilla"])
 ),
 msg,
 )
-if installed:
+message = None if installed else "PyQt6-QScintilla could not be installed."
-# try to import it again
-try:
-from PyQt6 import Qsci  # __IGNORE_WARNING__
-message = None
-except ImportError as msg:
-message = str(msg)
-else:
-message = "PyQt6-QScintilla could not be installed."
 if message:
 print("Sorry, please install QScintilla2 and")
 print("its PyQt6 wrapper.")
 print("Error: {0}".format(message))
 exit(1)
 print("Please install another version.")
 exit(5)
 # print version info for additional modules
 with contextlib.suppress(NameError, AttributeError):
-print("PyQt6-Charts:", QtCharts.PYQT_CHART_VERSION_STR)
+from PyQt6.QtCharts import PYQT_CHART_VERSION_STR  # noqa: I101, I102
+print("PyQt6-Charts:", PYQT_CHART_VERSION_STR)
 with contextlib.suppress(ImportError, AttributeError):
 from PyQt6 import QtWebEngineCore  # noqa: I101, I102
 print("PyQt6-WebEngine:", QtWebEngineCore.PYQT_WEBENGINE_VERSION_STR)
 ]
 ProcessPoolExecutor = None
 if workers != 1:
 try:
-from concurrent.futures import ProcessPoolExecutor  # __IGNORE_WARNING__
+from concurrent.futures import ProcessPoolExecutor  # noqa: I101, I103
 except NotImplementedError:
 workers = 1
 if workers != 1 and ProcessPoolExecutor is not None:
 # If workers == 0, let ProcessPoolExecutor determine worker count.

Mercurial Repositories > eric / file comparison

comparison: scripts/install.py

scripts/install.py