Mercurial Repositories > eric / changeset

--- a/eric7/UI/Previewers/PreviewerHTML.py	Wed Oct 06 18:37:16 2021 +0200
+++ b/eric7/UI/Previewers/PreviewerHTML.py	Wed Oct 06 18:38:26 2021 +0200
@@ -58,7 +58,7 @@
             self.__previewAvailable = False
             self.titleLabel.setText(self.tr(
                 "<b>HTML Preview is not available!<br/>"
-                "Install PyQtWebEngine.</b>"))
+                "Install PyQt6-WebEngine.</b>"))
             self.titleLabel.setAlignment(Qt.AlignmentFlag.AlignHCenter)
             self.__layout.addStretch()
             return

--- a/eric7/WebBrowser/WebBrowserPage.py	Wed Oct 06 18:37:16 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Wed Oct 06 18:38:26 2021 +0200
@@ -155,17 +155,10 @@
             return False
         
         # GreaseMonkey
-        try:
-            # PyQtWebEngine >= 5.14.0
-            navigationType = type_ in [
-                QWebEnginePage.NavigationType.NavigationTypeLinkClicked,
-                QWebEnginePage.NavigationType.NavigationTypeRedirect
-            ]
-        except AttributeError:
-            navigationType = (
-                type_ ==
-                QWebEnginePage.NavigationType.NavigationTypeLinkClicked
-            )
+        navigationType = type_ in (
+            QWebEnginePage.NavigationType.NavigationTypeLinkClicked,
+            QWebEnginePage.NavigationType.NavigationTypeRedirect
+        )
         if navigationType and url.toString().endswith(".user.js"):
             WebBrowserWindow.greaseMonkeyManager().downloadScript(url)
             return False