Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- branch
- 5_1_x
- changeset 1220
- efe069d7562d
- parent 826
- 2e3e2055e715
- child 1372
- 78a9250e52de
equal
deleted
inserted
replaced
| 1218:825a24cf43f7 | 1220:efe069d7562d |
|---|---|
| 12 from PyQt4.QtCore import * | 12 from PyQt4.QtCore import * |
| 13 from PyQt4.QtGui import QDialog | 13 from PyQt4.QtGui import QDialog |
| 14 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply | 14 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply |
| 15 try: | 15 try: |
| 16 from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \ | 16 from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket, \ |
| 17 QSslError | 17 QSslError, QSsl |
| 18 SSL_AVAILABLE = True | 18 SSL_AVAILABLE = True |
| 19 except ImportError: | 19 except ImportError: |
| 20 SSL_AVAILABLE = False | 20 SSL_AVAILABLE = False |
| 21 | 21 |
| 22 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 79 for cert in QSslCertificate.fromData(certificateDict[server]): | 79 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 80 if cert not in caList: | 80 if cert not in caList: |
| 81 caList.append(cert) | 81 caList.append(cert) |
| 82 sslCfg = QSslConfiguration.defaultConfiguration() | 82 sslCfg = QSslConfiguration.defaultConfiguration() |
| 83 sslCfg.setCaCertificates(caList) | 83 sslCfg.setCaCertificates(caList) |
| 84 sslCfg.setProtocol(QSsl.AnyProtocol) | |
| 84 QSslConfiguration.setDefaultConfiguration(sslCfg) | 85 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 85 | 86 |
| 86 self.sslErrors.connect(self.__sslErrors) | 87 self.sslErrors.connect(self.__sslErrors) |
| 87 | 88 |
| 88 self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired) | 89 self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired) |
| 249 sslCfg = QSslConfiguration.defaultConfiguration() | 250 sslCfg = QSslConfiguration.defaultConfiguration() |
| 250 caList = sslCfg.caCertificates() | 251 caList = sslCfg.caCertificates() |
| 251 for cert in caNew: | 252 for cert in caNew: |
| 252 caList.append(cert) | 253 caList.append(cert) |
| 253 sslCfg.setCaCertificates(caList) | 254 sslCfg.setCaCertificates(caList) |
| 255 sslCfg.setProtocol(QSsl.AnyProtocol) | |
| 254 QSslConfiguration.setDefaultConfiguration(sslCfg) | 256 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 255 reply.setSslConfiguration(sslCfg) | 257 reply.setSslConfiguration(sslCfg) |
| 256 | 258 |
| 257 certificateDict = {} | 259 certificateDict = {} |
| 258 for server in caMerge: | 260 for server in caMerge: |
