diff -r c0a3a6e40815 -r 394377638256 eric7/EricNetwork/EricSslErrorHandler.py
--- a/eric7/EricNetwork/EricSslErrorHandler.py Sat Sep 25 18:08:10 2021 +0200
+++ b/eric7/EricNetwork/EricSslErrorHandler.py Sat Sep 25 18:12:48 2021 +0200
@@ -46,16 +46,16 @@
super().__init__(parent)
caList = self.__getSystemCaCertificates()
- if Preferences.Prefs.settings.contains("Help/CaCertificatesDict"):
+ if Preferences.getSettings().contains("Help/CaCertificatesDict"):
# port old entries stored under 'Help'
certificateDict = Globals.toDict(
- Preferences.Prefs.settings.value("Help/CaCertificatesDict"))
- Preferences.Prefs.settings.setValue(
+ Preferences.getSettings().value("Help/CaCertificatesDict"))
+ Preferences.getSettings().setValue(
"Ssl/CaCertificatesDict", certificateDict)
- Preferences.Prefs.settings.remove("Help/CaCertificatesDict")
+ Preferences.getSettings().remove("Help/CaCertificatesDict")
else:
certificateDict = Globals.toDict(
- Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+ Preferences.getSettings().value("Ssl/CaCertificatesDict"))
for server in certificateDict:
for cert in QSslCertificate.fromData(certificateDict[server]):
if cert not in caList:
@@ -121,7 +121,7 @@
"""
caMerge = {}
certificateDict = Globals.toDict(
- Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+ Preferences.getSettings().value("Ssl/CaCertificatesDict"))
for caServer in certificateDict:
caMerge[caServer] = QSslCertificate.fromData(
certificateDict[caServer])
@@ -195,7 +195,7 @@
for cert in caMerge[server]:
pems.append(cert.toPem() + b'\n')
certificateDict[server] = pems
- Preferences.Prefs.settings.setValue(
+ Preferences.getSettings().setValue(
"Ssl/CaCertificatesDict",
certificateDict)
@@ -267,7 +267,7 @@
@return list of system certificates (list of QSslCertificate)
"""
caList = QSslCertificate.fromData(Globals.toByteArray(
- Preferences.Prefs.settings.value("Ssl/SystemCertificates")))
+ Preferences.getSettings().value("Ssl/SystemCertificates")))
if not caList:
caList = QSslConfiguration.systemCaCertificates()
return caList
