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