Mercurial Repositories > eric / changeset

--- a/eric7/WebBrowser/WebBrowserPage.py	Sat Oct 16 20:36:57 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserPage.py	Sat Oct 16 20:37:32 2021 +0200
@@ -432,11 +432,7 @@
         )
         if worldId != self.__channelWorldId:
             self.__channelWorldId = worldId
-            try:
-                self.setWebChannel(channel, self.__channelWorldId)
-            except TypeError:
-                # pre Qt 5.7.0
-                self.setWebChannel(channel)
+            self.setWebChannel(channel, self.__channelWorldId)
     
     def certificateError(self, error):
         """

--- a/eric7/WebBrowser/WebBrowserView.py	Sat Oct 16 20:36:57 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserView.py	Sat Oct 16 20:37:32 2021 +0200
@@ -154,13 +154,7 @@
         # WebBrowserPage.
         self.__page.selectClientCertificate.connect(
             self.__selectClientCertificate)
-        with contextlib.suppress(AttributeError, ImportError):
-            #- Qt >= 5.14
-            from PyQt6.QtWebEngineCore import QWebEngineFindTextResult
-            # __IGNORE_WARNING__
-            
-            self.__page.findTextFinished.connect(
-                self.__findTextFinished)
+        self.__page.findTextFinished.connect(self.__findTextFinished)
     
     def __setRwhvqt(self):
         """
@@ -545,8 +539,6 @@
         """
         Protected method called to create a context menu.
         
-        This method is overridden from QWebEngineView.
-        
         @param evt reference to the context menu event object
             (QContextMenuEvent)
         """
@@ -1505,7 +1497,8 @@
         """
         Protected method handling gesture events.
         
-        @param evt reference to the gesture event (QGestureEvent
+        @param evt reference to the gesture event
+        @type QGestureEvent
         """
         pinch = evt.gesture(Qt.GestureType.PinchGesture)
         if pinch:

--- a/eric7/WebBrowser/WebBrowserWindow.py	Sat Oct 16 20:36:57 2021 +0200
+++ b/eric7/WebBrowser/WebBrowserWindow.py	Sat Oct 16 20:37:32 2021 +0200
@@ -652,13 +652,10 @@
             QWebEngineSettings.WebAttribute.DnsPrefetchEnabled,
             Preferences.getWebBrowser(
                 "DnsPrefetchEnabled"))
-        
-        with contextlib.suppress(AttributeError, KeyError):
-            # Qt 5.13
-            settings.setAttribute(
-                QWebEngineSettings.WebAttribute.PdfViewerEnabled,
-                Preferences.getWebBrowser(
-                    "PdfViewerEnabled"))
+        settings.setAttribute(
+            QWebEngineSettings.WebAttribute.PdfViewerEnabled,
+            Preferences.getWebBrowser(
+                "PdfViewerEnabled"))
     
     def __initActions(self):
         """