Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/WebBrowserWindow.py	Thu Apr 15 16:52:05 2021 +0200
+++ b/eric6/WebBrowser/WebBrowserWindow.py	Thu Apr 15 18:11:24 2021 +0200
@@ -11,6 +11,7 @@
 import shutil
 import sys
 import functools
+import contextlib
 
 from PyQt5.QtCore import (
     pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, QProcess,
@@ -646,14 +647,12 @@
             Preferences.getWebBrowser(
                 "DnsPrefetchEnabled"))
         
-        try:
+        with contextlib.suppress(AttributeError, KeyError):
             # Qt 5.13
             settings.setAttribute(
                 QWebEngineSettings.WebAttribute.PdfViewerEnabled,
                 Preferences.getWebBrowser(
                     "PdfViewerEnabled"))
-        except (AttributeError, KeyError):
-            pass
     
     def __initActions(self):
         """
@@ -2805,7 +2804,7 @@
         else:
             Preferences.setGeometry("WebBrowserGeometry", QByteArray())
         
-        try:
+        with contextlib.suppress(ValueError):
             browserIndex = WebBrowserWindow.BrowserWindows.index(self)
             if len(WebBrowserWindow.BrowserWindows) and browserIndex == 0:
                 if len(WebBrowserWindow.BrowserWindows) > 1:
@@ -2821,8 +2820,6 @@
                     QDesktopServices.unsetUrlHandler("https")
             if len(WebBrowserWindow.BrowserWindows) > 0:
                 del WebBrowserWindow.BrowserWindows[browserIndex]
-        except ValueError:
-            pass
         
         Preferences.syncPreferences()
         if (
@@ -3214,14 +3211,11 @@
                     QWebEngineProfile.HttpCacheType.MemoryHttpCache)
                 profile.setHttpCacheMaximumSize(0)
         
-        try:
+        with contextlib.suppress(AttributeError):
             profile.setSpellCheckEnabled(
                 Preferences.getWebBrowser("SpellCheckEnabled"))
             profile.setSpellCheckLanguages(
                 Preferences.getWebBrowser("SpellCheckLanguages"))
-        except AttributeError:
-            # not yet supported
-            pass
         
         self.__virusTotal.preferencesChanged()
         if (
@@ -4795,14 +4789,11 @@
                     QWebEngineProfile.PersistentCookiesPolicy
                     .AllowPersistentCookies)
             
-            try:
+            with contextlib.suppress(AttributeError):
                 cls._webProfile.setSpellCheckEnabled(
                     Preferences.getWebBrowser("SpellCheckEnabled"))
                 cls._webProfile.setSpellCheckLanguages(
                     Preferences.getWebBrowser("SpellCheckLanguages"))
-            except AttributeError:
-                # not yet supported
-                pass
             
             # Setup QWebChannel user scripts
             from .WebBrowserPage import WebBrowserPage