Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 7
- c679fb30c8f3
- parent 0
- de9c2efb9d02
- child 8
- 0ae9bd4d2993
equal
deleted
inserted
replaced
| 6:52e8c820d0dd | 7:c679fb30c8f3 |
|---|---|
| 64 | 64 |
| 65 if SSL_AVAILABLE: | 65 if SSL_AVAILABLE: |
| 66 sslCfg = QSslConfiguration.defaultConfiguration() | 66 sslCfg = QSslConfiguration.defaultConfiguration() |
| 67 caList = sslCfg.caCertificates() | 67 caList = sslCfg.caCertificates() |
| 68 caNew = QSslCertificate.fromData(Preferences.Prefs.settings\ | 68 caNew = QSslCertificate.fromData(Preferences.Prefs.settings\ |
| 69 .value("Help/CaCertificates").toByteArray()) | 69 .value("Help/CaCertificates")) |
| 70 for cert in caNew: | 70 for cert in caNew: |
| 71 caList.append(cert) | 71 caList.append(cert) |
| 72 sslCfg.setCaCertificates(caList) | 72 sslCfg.setCaCertificates(caList) |
| 73 QSslConfiguration.setDefaultConfiguration(sslCfg) | 73 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 74 | 74 |
| 236 | 236 |
| 237 @param reply reference to the reply object (QNetworkReply) | 237 @param reply reference to the reply object (QNetworkReply) |
| 238 @param errors list of SSL errors (list of QSslError) | 238 @param errors list of SSL errors (list of QSslError) |
| 239 """ | 239 """ |
| 240 caMerge = QSslCertificate.fromData(Preferences.Prefs.settings\ | 240 caMerge = QSslCertificate.fromData(Preferences.Prefs.settings\ |
| 241 .value("Help/CaCertificates").toByteArray()) | 241 .value("Help/CaCertificates")) |
| 242 caNew = [] | 242 caNew = [] |
| 243 | 243 |
| 244 errorStrings = [] | 244 errorStrings = [] |
| 245 for err in errors: | 245 for err in errors: |
| 246 if err.certificate() in caMerge: | 246 if err.certificate() in caMerge: |
| 291 reply.setSslConfiguration(sslCfg) | 291 reply.setSslConfiguration(sslCfg) |
| 292 | 292 |
| 293 pems = QByteArray() | 293 pems = QByteArray() |
| 294 for cert in caMerge: | 294 for cert in caMerge: |
| 295 pems.append(cert.toPem() + '\n') | 295 pems.append(cert.toPem() + '\n') |
| 296 Preferences.Prefs.settings.setValue("Help/CaCertificates", | 296 Preferences.Prefs.settings.setValue("Help/CaCertificates", pems) |
| 297 QVariant(pems)) | |
| 298 | 297 |
| 299 reply.ignoreSslErrors() | 298 reply.ignoreSslErrors() |
| 300 | 299 |
| 301 def __certToString(self, cert): | 300 def __certToString(self, cert): |
| 302 """ | 301 """ |
| 335 | 334 |
| 336 def languagesChanged(self): | 335 def languagesChanged(self): |
| 337 """ | 336 """ |
| 338 Public slot to (re-)load the list of accepted languages. | 337 Public slot to (re-)load the list of accepted languages. |
| 339 """ | 338 """ |
| 340 languages = Preferences.Prefs.settings.value( | 339 languages = Preferences.Prefs.settings.value(Preferences.toList( |
| 341 "Help/AcceptLanguages", | 340 "Help/AcceptLanguages", |
| 342 QVariant(HelpLanguagesDialog.defaultAcceptLanguages()))\ | 341 HelpLanguagesDialog.defaultAcceptLanguages())) |
| 343 .toStringList() | |
| 344 self.__acceptLanguage = HelpLanguagesDialog.httpString(languages) | 342 self.__acceptLanguage = HelpLanguagesDialog.httpString(languages) |
| 345 | 343 |
| 346 def __setDiskCache(self): | 344 def __setDiskCache(self): |
| 347 """ | 345 """ |
| 348 Private method to set the disk cache. | 346 Private method to set the disk cache. |
