Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Network/NetworkAccessManager.py
Helpviewer/Network/NetworkAccessManager.py
- changeset 1367
- a652a6794953
- parent 1366
- f2e7957924cb
- child 1509
- c0b5e693b0eb
equal
deleted
inserted
replaced
| 1366:f2e7957924cb | 1367:a652a6794953 |
|---|---|
| 243 certinfos = [] | 243 certinfos = [] |
| 244 for cert in caNew: | 244 for cert in caNew: |
| 245 certinfos.append(self.__certToString(cert)) | 245 certinfos.append(self.__certToString(cert)) |
| 246 ret = E5MessageBox.yesNo(None, | 246 ret = E5MessageBox.yesNo(None, |
| 247 self.trUtf8("Certificates"), | 247 self.trUtf8("Certificates"), |
| 248 self.trUtf8("""Certificates:\n\n{0}\n\n""" | 248 self.trUtf8("""<p>Certificates:<br/>{0}<br/>""" |
| 249 """Do you want to accept all these certificates?""")\ | 249 """Do you want to accept all these certificates?</p>""")\ |
| 250 .format("\n\n".join(certinfos)), | 250 .format("".join(certinfos))) |
| 251 textFormat=Qt.PlainText) | |
| 252 if ret: | 251 if ret: |
| 253 if server not in caMerge: | 252 if server not in caMerge: |
| 254 caMerge[server] = [] | 253 caMerge[server] = [] |
| 255 for cert in caNew: | 254 for cert in caNew: |
| 256 caMerge[server].append(cert) | 255 caMerge[server].append(cert) |
| 286 Private method to convert a certificate to a formatted string. | 285 Private method to convert a certificate to a formatted string. |
| 287 | 286 |
| 288 @param cert certificate to convert (QSslCertificate) | 287 @param cert certificate to convert (QSslCertificate) |
| 289 @return formatted string (string) | 288 @return formatted string (string) |
| 290 """ | 289 """ |
| 291 result = "" | 290 result = "<p>" |
| 292 | 291 |
| 293 result += self.trUtf8("Name: {0}")\ | 292 result += self.trUtf8("Name: {0}")\ |
| 294 .format(Utilities.decodeString( | 293 .format(Qt.escape(Utilities.decodeString( |
| 295 cert.subjectInfo(QSslCertificate.CommonName))) | 294 cert.subjectInfo(QSslCertificate.CommonName)))) |
| 296 | 295 |
| 297 result += self.trUtf8("\nOrganization: {0}")\ | 296 result += self.trUtf8("<br/>Organization: {0}")\ |
| 298 .format(Utilities.decodeString( | 297 .format(Qt.escape(Utilities.decodeString( |
| 299 cert.subjectInfo(QSslCertificate.Organization))) | 298 cert.subjectInfo(QSslCertificate.Organization)))) |
| 300 | 299 |
| 301 result += self.trUtf8("\nIssuer: {0}")\ | 300 result += self.trUtf8("<br/>Issuer: {0}")\ |
| 302 .format(Utilities.decodeString( | 301 .format(Qt.escape(Utilities.decodeString( |
| 303 cert.issuerInfo(QSslCertificate.CommonName))) | 302 cert.issuerInfo(QSslCertificate.CommonName)))) |
| 304 | 303 |
| 305 result += self.trUtf8("\nNot valid before: {0}\nValid Until: {1}")\ | 304 result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\ |
| 306 .format(cert.effectiveDate().toString("yyyy-MM-dd"), | 305 .format(Qt.escape(cert.effectiveDate().toString("yyyy-MM-dd")), |
| 307 cert.expiryDate().toString("yyyy-MM-dd")) | 306 Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))) |
| 307 | |
| 308 result += "</p>" | |
| 308 | 309 |
| 309 return result | 310 return result |
| 310 | 311 |
| 311 def __getSystemCaCertificates(self): | 312 def __getSystemCaCertificates(self): |
| 312 """ | 313 """ |
