Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslErrorHandler.py
E5Network/E5SslErrorHandler.py
- branch
- Py2 comp.
- changeset 3484
- 645c12de6b0c
- parent 3178
- f25fc1364c88
- parent 3190
- a9a94491c4fd
- child 3656
- 441956d8fce5
equal
deleted
inserted
replaced
| 3456:96232974dcdb | 3484:645c12de6b0c |
|---|---|
| 130 return E5SslErrorHandler.SystemIgnored, False | 130 return E5SslErrorHandler.SystemIgnored, False |
| 131 | 131 |
| 132 errorString = '.</li><li>'.join(errorStrings) | 132 errorString = '.</li><li>'.join(errorStrings) |
| 133 ret = E5MessageBox.yesNo( | 133 ret = E5MessageBox.yesNo( |
| 134 None, | 134 None, |
| 135 self.trUtf8("SSL Errors"), | 135 self.tr("SSL Errors"), |
| 136 self.trUtf8("""<p>SSL Errors for <br /><b>{0}</b>""" | 136 self.tr("""<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 |
| 145 certinfos = [] | 145 certinfos = [] |
| 146 for cert in caNew: | 146 for cert in caNew: |
| 147 certinfos.append(self.__certToString(cert)) | 147 certinfos.append(self.__certToString(cert)) |
| 148 caRet = E5MessageBox.yesNo( | 148 caRet = E5MessageBox.yesNo( |
| 149 None, | 149 None, |
| 150 self.trUtf8("Certificates"), | 150 self.tr("Certificates"), |
| 151 self.trUtf8( | 151 self.tr( |
| 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: |
| 190 @return formatted string (string) | 190 @return formatted string (string) |
| 191 """ | 191 """ |
| 192 result = "<p>" | 192 result = "<p>" |
| 193 | 193 |
| 194 if qVersion() >= "5.0.0": | 194 if qVersion() >= "5.0.0": |
| 195 result += self.trUtf8("Name: {0}")\ | 195 result += self.tr("Name: {0}")\ |
| 196 .format(Utilities.html_encode(Utilities.decodeString( | 196 .format(Utilities.html_encode(Utilities.decodeString( |
| 197 ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))) | 197 ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))) |
| 198 | 198 |
| 199 result += self.trUtf8("<br/>Organization: {0}")\ | 199 result += self.tr("<br/>Organization: {0}")\ |
| 200 .format(Utilities.html_encode(Utilities.decodeString( | 200 .format(Utilities.html_encode(Utilities.decodeString( |
| 201 ", ".join(cert.subjectInfo( | 201 ", ".join(cert.subjectInfo( |
| 202 QSslCertificate.Organization))))) | 202 QSslCertificate.Organization))))) |
| 203 | 203 |
| 204 result += self.trUtf8("<br/>Issuer: {0}")\ | 204 result += self.tr("<br/>Issuer: {0}")\ |
| 205 .format(Utilities.html_encode(Utilities.decodeString( | 205 .format(Utilities.html_encode(Utilities.decodeString( |
| 206 ", ".join(cert.issuerInfo(QSslCertificate.CommonName))))) | 206 ", ".join(cert.issuerInfo(QSslCertificate.CommonName))))) |
| 207 else: | 207 else: |
| 208 result += self.trUtf8("Name: {0}")\ | 208 result += self.tr("Name: {0}")\ |
| 209 .format(Utilities.html_encode(Utilities.decodeString( | 209 .format(Utilities.html_encode(Utilities.decodeString( |
| 210 cert.subjectInfo(QSslCertificate.CommonName)))) | 210 cert.subjectInfo(QSslCertificate.CommonName)))) |
| 211 | 211 |
| 212 result += self.trUtf8("<br/>Organization: {0}")\ | 212 result += self.tr("<br/>Organization: {0}")\ |
| 213 .format(Utilities.html_encode(Utilities.decodeString( | 213 .format(Utilities.html_encode(Utilities.decodeString( |
| 214 cert.subjectInfo(QSslCertificate.Organization)))) | 214 cert.subjectInfo(QSslCertificate.Organization)))) |
| 215 | 215 |
| 216 result += self.trUtf8("<br/>Issuer: {0}")\ | 216 result += self.tr("<br/>Issuer: {0}")\ |
| 217 .format(Utilities.html_encode(Utilities.decodeString( | 217 .format(Utilities.html_encode(Utilities.decodeString( |
| 218 cert.issuerInfo(QSslCertificate.CommonName)))) | 218 cert.issuerInfo(QSslCertificate.CommonName)))) |
| 219 | 219 |
| 220 result += self.trUtf8( | 220 result += self.tr( |
| 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"))) |
