Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/Network/NetworkManager.py	Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/WebBrowser/Network/NetworkManager.py	Sat May 01 14:27:20 2021 +0200
@@ -8,6 +8,7 @@
 """
 
 import json
+import contextlib
 
 from PyQt5.QtCore import pyqtSignal, QByteArray
 from PyQt5.QtWidgets import QStyle, QDialog
@@ -48,7 +49,7 @@
         @param engine reference to the help engine (QHelpEngine)
         @param parent reference to the parent object (QObject)
         """
-        super(NetworkManager, self).__init__(parent)
+        super().__init__(parent)
         
         from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
         
@@ -123,12 +124,9 @@
         
         dbString = Preferences.getWebBrowser("SslExceptionsDB")
         if dbString:
-            try:
+            with contextlib.suppress(ValueError):
                 db = json.loads(dbString)
                 self.__permanentlyIgnoredSslErrors = db
-            except ValueError:
-                # ignore silently
-                pass
         
         self.__loaded = True
     
@@ -280,14 +278,13 @@
         realm = auth.realm()
         if not realm and 'realm' in auth.options():
             realm = auth.option("realm")
-        if realm:
-            info = self.tr(
-                "<b>Enter username and password for '{0}', realm '{1}'</b>"
-            ).format(urlRoot, realm)
-        else:
-            info = self.tr(
-                "<b>Enter username and password for '{0}'</b>"
-            ).format(urlRoot)
+        info = (
+            self.tr("<b>Enter username and password for '{0}', realm '{1}'</b>"
+                    ).format(urlRoot, realm)
+            if realm else
+            self.tr("<b>Enter username and password for '{0}'</b>"
+                    ).format(urlRoot)
+        )
         
         from UI.AuthenticationDialog import AuthenticationDialog
         import WebBrowser.WebBrowserWindow
@@ -429,4 +426,4 @@
         req.setAttribute(
             QNetworkRequest.Attribute.FollowRedirectsAttribute, True)
         
-        return super(NetworkManager, self).createRequest(op, req, data)
+        return super().createRequest(op, req, data)