Mercurial Repositories > eric / file diff

--- a/eric7/eric7_browser.py	Sun May 16 11:43:59 2021 +0200
+++ b/eric7/eric7_browser.py	Sun May 16 20:07:24 2021 +0200
@@ -14,17 +14,9 @@
 
 import sys
 import os
-import contextlib
 
 sys.path.insert(1, os.path.dirname(__file__))
 
-with contextlib.suppress(AttributeError):
-    try:
-        from PyQt5 import sip       # __IGNORE_EXCEPTION__
-    except ImportError:
-        import sip
-    sip.setdestroyonexit(False)
-
 app = None
 SettingsDir = None
 
@@ -35,7 +27,7 @@
         Globals.setConfigDir(configDir)
         sys.argv.remove(arg)
     elif arg.startswith("--settings="):
-        from PyQt5.QtCore import QSettings
+        from PyQt6.QtCore import QSettings
         SettingsDir = os.path.expanduser(arg.replace("--settings=", ""))
         if not os.path.isdir(SettingsDir):
             os.makedirs(SettingsDir)
@@ -44,11 +36,11 @@
         sys.argv.remove(arg)
 
 try:
-    from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
+    from PyQt6 import QtWebEngineWidgets    # __IGNORE_WARNING__
 except ImportError:
     if "--quiet" not in sys.argv:
-        from PyQt5.QtCore import QTimer
-        from PyQt5.QtWidgets import QApplication
+        from PyQt6.QtCore import QTimer
+        from PyQt6.QtWidgets import QApplication
         from E5Gui import E5MessageBox          # __IGNORE_WARNING__
         app = QApplication([])
         QTimer.singleShot(0, lambda: E5MessageBox.critical(
@@ -59,7 +51,7 @@
         app.exec()
     sys.exit(100)
 
-from PyQt5.QtWebEngineCore import QWebEngineUrlScheme
+from PyQt6.QtWebEngineCore import QWebEngineUrlScheme
 
 import Globals
 from Globals import AppInfo
@@ -131,7 +123,7 @@
     """
     global app
     
-    from PyQt5.QtGui import QGuiApplication
+    from PyQt6.QtGui import QGuiApplication
     QGuiApplication.setDesktopFileName("eric7_browser.desktop")
     
     options = [