Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 140
- 64f805e1f105
- parent 96
- 9624a110667d
- child 270
- 41505c92ac31
equal
deleted
inserted
replaced
| 139:5c4f1a9ae0bb | 140:64f805e1f105 |
|---|---|
| 61 self.languagesChanged() | 61 self.languagesChanged() |
| 62 | 62 |
| 63 if SSL_AVAILABLE: | 63 if SSL_AVAILABLE: |
| 64 sslCfg = QSslConfiguration.defaultConfiguration() | 64 sslCfg = QSslConfiguration.defaultConfiguration() |
| 65 caList = sslCfg.caCertificates() | 65 caList = sslCfg.caCertificates() |
| 66 caNew = QSslCertificate.fromData(Preferences.Prefs.settings\ | 66 caNew = QSslCertificate.fromData(Preferences.toByteArray( |
| 67 .value("Help/CaCertificates")) | 67 Preferences.Prefs.settings.value("Help/CaCertificates"))) |
| 68 for cert in caNew: | 68 for cert in caNew: |
| 69 caList.append(cert) | 69 caList.append(cert) |
| 70 sslCfg.setCaCertificates(caList) | 70 sslCfg.setCaCertificates(caList) |
| 71 QSslConfiguration.setDefaultConfiguration(sslCfg) | 71 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 72 | 72 |
| 233 Private slot to handle SSL errors. | 233 Private slot to handle SSL errors. |
| 234 | 234 |
| 235 @param reply reference to the reply object (QNetworkReply) | 235 @param reply reference to the reply object (QNetworkReply) |
| 236 @param errors list of SSL errors (list of QSslError) | 236 @param errors list of SSL errors (list of QSslError) |
| 237 """ | 237 """ |
| 238 caMerge = QSslCertificate.fromData(Preferences.Prefs.settings\ | 238 caMerge = QSslCertificate.fromData(Preferences.toByteArray( |
| 239 .value("Help/CaCertificates")) | 239 Preferences.Prefs.settings.value("Help/CaCertificates"))) |
| 240 caNew = [] | 240 caNew = [] |
| 241 | 241 |
| 242 errorStrings = [] | 242 errorStrings = [] |
| 243 for err in errors: | 243 for err in errors: |
| 244 if err.certificate() in caMerge: | 244 if err.certificate() in caMerge: |
