eric6/WebBrowser/Network/NetworkManager.py

branch
maintenance
changeset 8176
31965986ecd1
parent 8043
0acf98cd089a
parent 8143
2c730d5fd177
child 8273
698ae46f40a4
diff -r e01ae92db699 -r 31965986ecd1 eric6/WebBrowser/Network/NetworkManager.py
--- a/eric6/WebBrowser/Network/NetworkManager.py	Sat Mar 06 10:00:52 2021 +0100
+++ b/eric6/WebBrowser/Network/NetworkManager.py	Sun Mar 28 15:00:11 2021 +0200
@@ -152,7 +152,7 @@
         
         from .SslErrorExceptionsDialog import SslErrorExceptionsDialog
         dlg = SslErrorExceptionsDialog(self.__permanentlyIgnoredSslErrors)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             self.__permanentlyIgnoredSslErrors = dlg.getSslErrorExceptions()
             self.changed.emit()
     
@@ -302,7 +302,7 @@
             )
             if username:
                 dlg.setData(username, password)
-        if dlg.exec() == QDialog.Accepted:
+        if dlg.exec() == QDialog.DialogCode.Accepted:
             username, password = dlg.getData()
             auth.setUser(username)
             auth.setPassword(password)
@@ -327,11 +327,13 @@
         """
         html = getHtmlPage("authenticationErrorPage.html")
         html = html.replace("@IMAGE@", pixmapToDataUrl(
-            e5App().style().standardIcon(QStyle.SP_MessageBoxCritical).pixmap(
-                48, 48)).toString())
+            e5App().style().standardIcon(
+                QStyle.StandardPixmap.SP_MessageBoxCritical).pixmap(48, 48)
+        ).toString())
         html = html.replace("@FAVICON@", pixmapToDataUrl(
-            e5App().style() .standardIcon(QStyle.SP_MessageBoxCritical).pixmap(
-                16, 16)).toString())
+            e5App().style() .standardIcon(
+                QStyle.StandardPixmap.SP_MessageBoxCritical).pixmap(16, 16)
+        ).toString())
         html = html.replace("@TITLE@", self.tr("Authentication required"))
         html = html.replace("@H1@", self.tr("Authentication required"))
         html = html.replace(
@@ -422,7 +424,9 @@
         @rtype QNetworkReply
         """
         req = QNetworkRequest(request)
-        req.setAttribute(QNetworkRequest.SpdyAllowedAttribute, True)
-        req.setAttribute(QNetworkRequest.FollowRedirectsAttribute, True)
+        req.setAttribute(
+            QNetworkRequest.Attribute.SpdyAllowedAttribute, True)
+        req.setAttribute(
+            QNetworkRequest.Attribute.FollowRedirectsAttribute, True)
         
         return super(NetworkManager, self).createRequest(op, req, data)

eric ide

mercurial