Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 664
- 3061f8bd826e
- parent 629
- c88489b378fb
- child 666
- fdd568d3533d
equal
deleted
inserted
replaced
| 661:f9d49e0c2522 | 664:3061f8bd826e |
|---|---|
| 11 | 11 |
| 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 QSsl, QSslCertificate, QSslConfiguration, QSslSocket | 16 from PyQt4.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslSocket, \ |
| 17 QSslError | |
| 17 SSL_AVAILABLE = True | 18 SSL_AVAILABLE = True |
| 18 except ImportError: | 19 except ImportError: |
| 19 SSL_AVAILABLE = False | 20 SSL_AVAILABLE = False |
| 20 | 21 |
| 21 from E5Gui import E5MessageBox | 22 from E5Gui import E5MessageBox |
| 195 Preferences.Prefs.settings.value("Help/CaCertificates"))) | 196 Preferences.Prefs.settings.value("Help/CaCertificates"))) |
| 196 caNew = [] | 197 caNew = [] |
| 197 | 198 |
| 198 errorStrings = [] | 199 errorStrings = [] |
| 199 for err in errors: | 200 for err in errors: |
| 201 if err.error() == QSslError.NoError: | |
| 202 continue | |
| 200 if err.certificate() in caMerge: | 203 if err.certificate() in caMerge: |
| 201 continue | 204 continue |
| 202 errorStrings.append(err.errorString()) | 205 errorStrings.append(err.errorString()) |
| 203 if not err.certificate().isNull(): | 206 if not err.certificate().isNull(): |
| 204 caNew.append(err.certificate()) | 207 caNew.append(err.certificate()) |
