Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Network/ProtocolHandlerManager.py	Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/WebBrowser/Network/ProtocolHandlerManager.py	Thu Apr 15 18:11:24 2021 +0200
@@ -9,6 +9,7 @@
 
 import os
 import json
+import contextlib
 
 from PyQt5.QtCore import QObject, QUrl
 from PyQt5.QtWebEngineWidgets import QWebEnginePage
@@ -97,7 +98,7 @@
         """
         Private method to load the registered protocol handlers.
         """
-        try:
+        with contextlib.suppress(OSError):
             with open(self.__protocolHandlersFileName(),
                       "r") as protocolHandlersFile:
                 protocolHandlersData = json.load(protocolHandlersFile)
@@ -108,9 +109,6 @@
                     url = QUrl(urlStr)
                     self.__protocolHandlers[scheme] = url
                     self.__registerHandler(scheme, url)
-        except OSError:
-            # ignore issues silently
-            pass
     
     def __save(self):
         """
@@ -136,12 +134,8 @@
         
         page = QWebEnginePage(self)
         page.loadFinished.connect(page.deleteLater)
-        try:
-            # for Qt >= 5.11
-            page.registerProtocolHandlerRequested.connect(
-                lambda r: r.accept())
-        except AttributeError:
-            pass
+        page.registerProtocolHandlerRequested.connect(
+            lambda r: r.accept())
         page.setHtml(
             "<script>navigator.registerProtocolHandler('{0}', '{1}', '')"
             "</script>".format(scheme, urlStr),