Mercurial Repositories > eric / file diff

--- a/eric7/Utilities/__init__.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/Utilities/__init__.py	Sun May 16 20:07:24 2021 +0200
@@ -43,11 +43,11 @@
 
 from codecs import BOM_UTF8, BOM_UTF16, BOM_UTF32
 
-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
     qVersion, PYQT_VERSION_STR, QDir, QProcess, QByteArray, QCoreApplication,
     QCryptographicHash
 )
-from PyQt5.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla
+from PyQt6.Qsci import QSCINTILLA_VERSION_STR, QsciScintilla
 
 # import these methods into the Utilities namespace
 from Globals import (  # __IGNORE_WARNING__
@@ -1844,7 +1844,7 @@
     """
     try:
         try:
-            from PyQt5 import sip
+            from PyQt6 import sip
         except ImportError:
             import sip
         sip_version_str = sip.SIP_VERSION_STR
@@ -1859,12 +1859,12 @@
     info.append("  Qt {0}".format(qVersion()))
     info.append("  PyQt {0}".format(PYQT_VERSION_STR))
     try:
-        from PyQt5 import QtChart
+        from PyQt6 import QtChart
         info.append("  PyQtChart {0}".format(QtChart.PYQT_CHART_VERSION_STR))
     except (ImportError, AttributeError):
         info.append("  PyQtChart not installed")
     try:
-        from PyQt5 import QtWebEngine
+        from PyQt6 import QtWebEngine
         info.append("  PyQtWebEngine {0}".format(
             QtWebEngine.PYQT_WEBENGINE_VERSION_STR))
     except (ImportError, AttributeError):
@@ -1872,7 +1872,7 @@
     info.append("  QScintilla {0}".format(QSCINTILLA_VERSION_STR))
     info.append("  sip {0}".format(sip_version_str))
     with contextlib.suppress(ImportError):
-        from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+        from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
         from WebBrowser.Tools import WebBrowserTools
         chromeVersion = WebBrowserTools.getWebEngineVersions()[0]
         info.append("  WebEngine {0}".format(chromeVersion))