Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserView.py	Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserView.py	Thu Apr 15 18:11:24 2021 +0200
@@ -10,6 +10,7 @@
 
 import os
 import functools
+import contextlib
 
 from PyQt5.QtCore import (
     pyqtSignal, pyqtSlot, Qt, QUrl, QFileInfo, QTimer, QEvent, QPoint,
@@ -149,28 +150,18 @@
         self.__page.safeBrowsingAbort.connect(self.safeBrowsingAbort)
         self.__page.safeBrowsingBad.connect(self.safeBrowsingBad)
         self.__page.printPageRequested.connect(self.__printPage)
-        try:
-            self.__page.quotaRequested.connect(self.__quotaRequested)
-            # The registerProtocolHandlerRequested signal is handled in
-            # WebBrowserPage.
-        except AttributeError:
-            # pre Qt 5.11
-            pass
-        try:
-            self.__page.selectClientCertificate.connect(
-                self.__selectClientCertificate)
-        except AttributeError:
-            # pre Qt 5.12
-            pass
-        try:
+        self.__page.quotaRequested.connect(self.__quotaRequested)
+        # The registerProtocolHandlerRequested signal is handled in
+        # WebBrowserPage.
+        self.__page.selectClientCertificate.connect(
+            self.__selectClientCertificate)
+        with contextlib.suppress(AttributeError, ImportError):
+            #- Qt >= 5.14
             from PyQt5.QtWebEngineCore import QWebEngineFindTextResult
             # __IGNORE_WARNING__
             
             self.__page.findTextFinished.connect(
                 self.__findTextFinished)
-        except (AttributeError, ImportError):
-            # pre Qt 5.14
-            pass
     
     def __setRwhvqt(self):
         """
@@ -1680,14 +1671,11 @@
             self.__siteIconLoader.deleteLater()
         self.__siteIconLoader = WebIconLoader(url, self)
         self.__siteIconLoader.iconLoaded.connect(self.__iconLoaded)
-        try:
+        with contextlib.suppress(AttributeError):
             self.__siteIconLoader.sslConfiguration.connect(
                 self.page().setSslConfiguration)
             self.__siteIconLoader.clearSslConfiguration.connect(
                 self.page().clearSslConfiguration)
-        except AttributeError:
-            # no SSL available
-            pass
     
     def __iconLoaded(self, icon):
         """