Mercurial Repositories > eric / file diff

--- a/src/eric7/EricNetwork/EricSslErrorHandler.py	Thu Sep 26 09:48:49 2024 +0200
+++ b/src/eric7/EricNetwork/EricSslErrorHandler.py	Thu Sep 26 15:49:36 2024 +0200
@@ -14,7 +14,7 @@
 from PyQt6.QtCore import QByteArray, QObject
 from PyQt6.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslError
 
-from eric7 import EricUtilities, Preferences, Utilities
+from eric7 import EricUtilities
 from eric7.EricWidgets import EricMessageBox
 from eric7.SystemUtilities import OSUtilities
 
@@ -37,18 +37,22 @@
     permanently accepted by the user already.
     """
 
-    def __init__(self, parent=None):
+    def __init__(self, settings, parent=None):
         """
         Constructor
 
-        @param parent reference to the parent object
-        @type QObject
+        @param settings reference to the settings object
+        @type QSettings
+        @param parent reference to the parent object (defaults to None)
+        @type QObject (optional)
         """
         super().__init__(parent)
 
+        self.__settings = settings
+
         caList = self.__getSystemCaCertificates()
         certificateDict = EricUtilities.toDict(
-            Preferences.getSettings().value("Ssl/CaCertificatesDict")
+            self.__settings.value("Ssl/CaCertificatesDict")
         )
         for server in certificateDict:
             for cert in QSslCertificate.fromData(certificateDict[server]):
@@ -117,7 +121,7 @@
         """
         caMerge = {}
         certificateDict = EricUtilities.toDict(
-            Preferences.getSettings().value("Ssl/CaCertificatesDict")
+            self.__settings.value("Ssl/CaCertificatesDict")
         )
         for caServer in certificateDict:
             caMerge[caServer] = QSslCertificate.fromData(certificateDict[caServer])
@@ -194,9 +198,7 @@
                         for cert in caMerge[server]:
                             pems.append(cert.toPem() + b"\n")
                         certificateDict[server] = pems
-                    Preferences.getSettings().setValue(
-                        "Ssl/CaCertificatesDict", certificateDict
-                    )
+                    self.__settings.setValue("Ssl/CaCertificatesDict", certificateDict)
 
             return EricSslErrorState.USER_IGNORED, caRet
 
@@ -215,16 +217,16 @@
         result = "<p>"
 
         result += self.tr("Name: {0}").format(
-            Utilities.html_encode(
-                Utilities.decodeString(
+            EricUtilities.html_encode(
+                EricUtilities.decodeString(
                     ", ".join(cert.subjectInfo(QSslCertificate.SubjectInfo.CommonName))
                 )
             )
         )
 
         result += self.tr("<br/>Organization: {0}").format(
-            Utilities.html_encode(
-                Utilities.decodeString(
+            EricUtilities.html_encode(
+                EricUtilities.decodeString(
                     ", ".join(
                         cert.subjectInfo(QSslCertificate.SubjectInfo.Organization)
                     )
@@ -233,15 +235,15 @@
         )
 
         result += self.tr("<br/>Issuer: {0}").format(
-            Utilities.html_encode(
-                Utilities.decodeString(
+            EricUtilities.html_encode(
+                EricUtilities.decodeString(
                     ", ".join(cert.issuerInfo(QSslCertificate.SubjectInfo.CommonName))
                 )
             )
         )
         result += self.tr("<br/>Not valid before: {0}<br/>Valid Until: {1}").format(
-            Utilities.html_encode(cert.effectiveDate().toString("yyyy-MM-dd")),
-            Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd")),
+            EricUtilities.html_encode(cert.effectiveDate().toString("yyyy-MM-dd")),
+            EricUtilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd")),
         )
 
         result += "</p>"
@@ -256,9 +258,7 @@
         @rtype list of QSslCertificate
         """
         caList = QSslCertificate.fromData(
-            EricUtilities.toByteArray(
-                Preferences.getSettings().value("Ssl/SystemCertificates")
-            )
+            EricUtilities.toByteArray(self.__settings.value("Ssl/SystemCertificates"))
         )
         if not caList:
             caList = QSslConfiguration.systemCaCertificates()