eric: comparison src/eric7/EricNetwork/EricSslCertificatesDialog.py

-:ce599998be7d
+:46651e194fbe
 from PyQt6.QtWidgets import QDialog, QTreeWidgetItem
 with contextlib.suppress(ImportError):
 from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration, QSsl
-from eric7 import EricUtilities, Preferences, Utilities
+from eric7 import EricUtilities
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from .Ui_EricSslCertificatesDialog import Ui_EricSslCertificatesDialog
 Class implementing a dialog to show and edit all certificates.
 """
 CertRole = Qt.ItemDataRole.UserRole + 1
-def __init__(self, parent=None):
+def __init__(self, settings, parent=None):
 """
 Constructor
+@param settings reference to the settings object
+@type QSettings
 @param parent reference to the parent widget
 @type QWidget
 """
 super().__init__(parent)
 self.setupUi(self)
+self.__settings = settings
 self.serversViewButton.setIcon(EricPixmapCache.getIcon("certificates"))
 self.serversDeleteButton.setIcon(EricPixmapCache.getIcon("certificateDelete"))
 self.serversExportButton.setIcon(EricPixmapCache.getIcon("certificateExport"))
 self.serversImportButton.setIcon(EricPixmapCache.getIcon("certificateImport"))
 def __populateServerCertificatesTree(self):
 """
 Private slot to populate the server certificates tree.
 """
 certificateDict = EricUtilities.toDict(
-Preferences.getSettings().value("Ssl/CaCertificatesDict")
+self.__settings.value("Ssl/CaCertificatesDict")
 )
 for server in certificateDict:
 for cert in QSslCertificate.fromData(certificateDict[server]):
 self.__createServerCertificateEntry(server, cert)
 @type str
 @param cert certificate to insert
 @type QSslCertificate
 """
 # step 1: extract the info to be shown
-organisation = Utilities.decodeString(
+organisation = EricUtilities.decodeString(
 ", ".join(cert.subjectInfo(QSslCertificate.SubjectInfo.Organization))
 )
-commonName = Utilities.decodeString(
+commonName = EricUtilities.decodeString(
 ", ".join(cert.subjectInfo(QSslCertificate.SubjectInfo.CommonName))
 )
 if organisation is None or organisation == "":
 organisation = self.tr("(Unknown)")
 if commonName is None or commonName == "":
 self.serversCertificatesTree.indexOfTopLevelItem(parent)
 )
 # delete the certificate from the user certificate store
 certificateDict = EricUtilities.toDict(
-Preferences.getSettings().value("Ssl/CaCertificatesDict")
+self.__settings.value("Ssl/CaCertificatesDict")
 )
 if server in certificateDict:
 certs = [
 c.toPem() for c in QSslCertificate.fromData(certificateDict[server])
 ]
 for cert in certs:
 pems.append(cert + b"\n")
 certificateDict[server] = pems
 else:
 del certificateDict[server]
-Preferences.getSettings().setValue(
+self.__settings.setValue("Ssl/CaCertificatesDict", certificateDict)
-"Ssl/CaCertificatesDict", certificateDict
-)
 # delete the certificate from the default certificates
 self.__updateDefaultConfiguration()
 @pyqtSlot()
 """
 certs = self.__importCertificate()
 if certs:
 server = "*"
 certificateDict = EricUtilities.toDict(
-Preferences.getSettings().value("Ssl/CaCertificatesDict")
+self.__settings.value("Ssl/CaCertificatesDict")
 )
 if server in certificateDict:
 sCerts = QSslCertificate.fromData(certificateDict[server])
 else:
 sCerts = []
 self,
 self.tr("Import Certificate"),
 self.tr(
 """<p>The certificate <b>{0}</b> already exists."""
 """ Skipping.</p>"""
-).format(Utilities.decodeString(commonStr)),
+).format(EricUtilities.decodeString(commonStr)),
 )
 else:
 pems.append(cert.toPem() + b"\n")
 if server not in certificateDict:
 certificateDict[server] = QByteArray()
 certificateDict[server].append(pems)
-Preferences.getSettings().setValue(
+self.__settings.setValue("Ssl/CaCertificatesDict", certificateDict)
-"Ssl/CaCertificatesDict", certificateDict
-)
 self.serversCertificatesTree.clear()
 self.__populateServerCertificatesTree()
 self.__updateDefaultConfiguration()
 """
 Private method to update the default SSL configuration.
 """
 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]):
 if cert not in caList:
 caList.append(cert)
 @return list of system certificates
 @rtype list of QSslCertificate
 """
 caList = QSslCertificate.fromData(
-EricUtilities.toByteArray(
+EricUtilities.toByteArray(self.__settings.value("Help/SystemCertificates"))
-Preferences.getSettings().value("Help/SystemCertificates")
-)
 )
 if not caList:
 caList = QSslConfiguration.systemCaCertificates()
 return caList
 @param cert certificate to insert
 @type QSslCertificate
 """
 # step 1: extract the info to be shown
-organisation = Utilities.decodeString(
+organisation = EricUtilities.decodeString(
 ", ".join(cert.subjectInfo(QSslCertificate.SubjectInfo.Organization))
 )
-commonName = Utilities.decodeString(
+commonName = EricUtilities.decodeString(
 ", ".join(cert.subjectInfo(QSslCertificate.SubjectInfo.CommonName))
 )
 if organisation is None or organisation == "":
 organisation = self.tr("(Unknown)")
 if commonName is None or commonName == "":
 if cert in caCerts:
 caCerts.remove(cert)
 pems = QByteArray()
 for cert in caCerts:
 pems.append(cert.toPem() + b"\n")
-Preferences.getSettings().setValue("Help/SystemCertificates", pems)
+self.__settings.setValue("Help/SystemCertificates", pems)
 # delete the certificate from the default certificates
 self.__updateDefaultConfiguration()
 @pyqtSlot()
 self,
 self.tr("Import Certificate"),
 self.tr(
 """<p>The certificate <b>{0}</b> already exists."""
 """ Skipping.</p>"""
-).format(Utilities.decodeString(commonStr)),
+).format(EricUtilities.decodeString(commonStr)),
 )
 else:
 caCerts.append(cert)
 pems = QByteArray()
 for cert in caCerts:
 pems.append(cert.toPem() + b"\n")
-Preferences.getSettings().setValue("Help/SystemCertificates", pems)
+self.__settings.setValue("Help/SystemCertificates", pems)
 self.caCertificatesTree.clear()
 self.__populateCaCertificatesTree()
 self.__updateDefaultConfiguration()

Mercurial Repositories > eric / file comparison

comparison: src/eric7/EricNetwork/EricSslCertificatesDialog.py

src/eric7/EricNetwork/EricSslCertificatesDialog.py