Mercurial Repositories > eric / file comparison
comparison: src/eric7/EricNetwork/EricSslErrorHandler.py
src/eric7/EricNetwork/EricSslErrorHandler.py
- branch
- eric7
- changeset 10820
- 7aa26e427d13
- parent 10806
- 2f6df822e3b9
- child 10928
- 46651e194fbe
equal
deleted
inserted
replaced
| 10819:e1a02e4225f8 | 10820:7aa26e427d13 |
|---|---|
| 45 @type QObject | 45 @type QObject |
| 46 """ | 46 """ |
| 47 super().__init__(parent) | 47 super().__init__(parent) |
| 48 | 48 |
| 49 caList = self.__getSystemCaCertificates() | 49 caList = self.__getSystemCaCertificates() |
| 50 if Preferences.getSettings().contains("Help/CaCertificatesDict"): | 50 certificateDict = EricUtilities.toDict( |
| 51 # port old entries stored under 'Help' | 51 Preferences.getSettings().value("Ssl/CaCertificatesDict") |
| 52 certificateDict = EricUtilities.toDict( | 52 ) |
| 53 Preferences.getSettings().value("Help/CaCertificatesDict") | |
| 54 ) | |
| 55 Preferences.getSettings().setValue( | |
| 56 "Ssl/CaCertificatesDict", certificateDict | |
| 57 ) | |
| 58 Preferences.getSettings().remove("Help/CaCertificatesDict") | |
| 59 else: | |
| 60 certificateDict = EricUtilities.toDict( | |
| 61 Preferences.getSettings().value("Ssl/CaCertificatesDict") | |
| 62 ) | |
| 63 for server in certificateDict: | 53 for server in certificateDict: |
| 64 for cert in QSslCertificate.fromData(certificateDict[server]): | 54 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 65 if cert not in caList: | 55 if cert not in caList: |
| 66 caList.append(cert) | 56 caList.append(cert) |
| 67 sslCfg = QSslConfiguration.defaultConfiguration() | 57 sslCfg = QSslConfiguration.defaultConfiguration() |
