Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslErrorHandler.py
E5Network/E5SslErrorHandler.py
- branch
- Py2 comp.
- changeset 3060
- 5883ce99ee12
- parent 3058
- 0a02c433f52d
- parent 3035
- 36e9f388958b
- child 3145
- a9de05d4a22f
equal
deleted
inserted
replaced
| 3058:0a02c433f52d | 3060:5883ce99ee12 |
|---|---|
| 104 SystemIgnored or UserIgnored) and indicating a change of the | 104 SystemIgnored or UserIgnored) and indicating a change of the |
| 105 default SSL configuration (boolean) | 105 default SSL configuration (boolean) |
| 106 """ | 106 """ |
| 107 caMerge = {} | 107 caMerge = {} |
| 108 certificateDict = Preferences.toDict( | 108 certificateDict = Preferences.toDict( |
| 109 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) | 109 Preferences.Prefs.settings.value("Ssl/CaCertificatesDict")) |
| 110 for caServer in certificateDict: | 110 for caServer in certificateDict: |
| 111 caMerge[caServer] = QSslCertificate.fromData( | 111 caMerge[caServer] = QSslCertificate.fromData( |
| 112 certificateDict[caServer]) | 112 certificateDict[caServer]) |
| 113 caNew = [] | 113 caNew = [] |
| 114 | 114 |
| 133 ret = E5MessageBox.yesNo( | 133 ret = E5MessageBox.yesNo( |
| 134 None, | 134 None, |
| 135 self.trUtf8("SSL Errors"), | 135 self.trUtf8("SSL Errors"), |
| 136 self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" | 136 self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" |
| 137 """<ul><li>{1}</li></ul></p>""" | 137 """<ul><li>{1}</li></ul></p>""" |
| 138 """<p>Do you want to ignore these errors?</p>""")\ | 138 """<p>Do you want to ignore these errors?</p>""") |
| 139 .format(server, errorString), | 139 .format(server, errorString), |
| 140 icon=E5MessageBox.Warning) | 140 icon=E5MessageBox.Warning) |
| 141 | 141 |
| 142 if ret: | 142 if ret: |
| 143 caRet = False | 143 caRet = False |
| 144 if len(caNew) > 0: | 144 if len(caNew) > 0: |
| 149 None, | 149 None, |
| 150 self.trUtf8("Certificates"), | 150 self.trUtf8("Certificates"), |
| 151 self.trUtf8( | 151 self.trUtf8( |
| 152 """<p>Certificates:<br/>{0}<br/>""" | 152 """<p>Certificates:<br/>{0}<br/>""" |
| 153 """Do you want to accept all these certificates?""" | 153 """Do you want to accept all these certificates?""" |
| 154 """</p>""")\ | 154 """</p>""") |
| 155 .format("".join(certinfos))) | 155 .format("".join(certinfos))) |
| 156 if caRet: | 156 if caRet: |
| 157 if server not in caMerge: | 157 if server not in caMerge: |
| 158 caMerge[server] = [] | 158 caMerge[server] = [] |
| 159 for cert in caNew: | 159 for cert in caNew: |
| 160 caMerge[server].append(cert) | 160 caMerge[server].append(cert) |
| 218 cert.issuerInfo(QSslCertificate.CommonName)))) | 218 cert.issuerInfo(QSslCertificate.CommonName)))) |
| 219 | 219 |
| 220 result += self.trUtf8( | 220 result += self.trUtf8( |
| 221 "<br/>Not valid before: {0}<br/>Valid Until: {1}")\ | 221 "<br/>Not valid before: {0}<br/>Valid Until: {1}")\ |
| 222 .format(Utilities.html_encode( | 222 .format(Utilities.html_encode( |
| 223 cert.effectiveDate().toString("yyyy-MM-dd")), | 223 cert.effectiveDate().toString("yyyy-MM-dd")), |
| 224 Utilities.html_encode( | 224 Utilities.html_encode( |
| 225 cert.expiryDate().toString("yyyy-MM-dd"))) | 225 cert.expiryDate().toString("yyyy-MM-dd"))) |
| 226 | 226 |
| 227 result += "</p>" | 227 result += "</p>" |
| 228 | 228 |
