Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 1219
- c051673f8aaf
- parent 1131
- 7781e396c903
- child 1314
- 7e7b88c58fda
equal
deleted
inserted
replaced
| 1217:f3d57bb18bdb | 1219:c051673f8aaf |
|---|---|
| 12 from PyQt4.QtCore import pyqtSignal, QByteArray | 12 from PyQt4.QtCore import pyqtSignal, QByteArray |
| 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 |
| 80 for cert in QSslCertificate.fromData(certificateDict[server]): | 80 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 81 if cert not in caList: | 81 if cert not in caList: |
| 82 caList.append(cert) | 82 caList.append(cert) |
| 83 sslCfg = QSslConfiguration.defaultConfiguration() | 83 sslCfg = QSslConfiguration.defaultConfiguration() |
| 84 sslCfg.setCaCertificates(caList) | 84 sslCfg.setCaCertificates(caList) |
| 85 sslCfg.setProtocol(QSsl.AnyProtocol) | |
| 85 QSslConfiguration.setDefaultConfiguration(sslCfg) | 86 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 86 | 87 |
| 87 self.sslErrors.connect(self.__sslErrors) | 88 self.sslErrors.connect(self.__sslErrors) |
| 88 | 89 |
| 89 self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired) | 90 self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired) |
| 250 sslCfg = QSslConfiguration.defaultConfiguration() | 251 sslCfg = QSslConfiguration.defaultConfiguration() |
| 251 caList = sslCfg.caCertificates() | 252 caList = sslCfg.caCertificates() |
| 252 for cert in caNew: | 253 for cert in caNew: |
| 253 caList.append(cert) | 254 caList.append(cert) |
| 254 sslCfg.setCaCertificates(caList) | 255 sslCfg.setCaCertificates(caList) |
| 256 sslCfg.setProtocol(QSsl.AnyProtocol) | |
| 255 QSslConfiguration.setDefaultConfiguration(sslCfg) | 257 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 256 reply.setSslConfiguration(sslCfg) | 258 reply.setSslConfiguration(sslCfg) |
| 257 | 259 |
| 258 certificateDict = {} | 260 certificateDict = {} |
| 259 for server in caMerge: | 261 for server in caMerge: |
