Helpviewer/SslCertificatesDialog.py

branch
5_1_x
changeset 1372
78a9250e52de
parent 922
f47d13653448
child 1510
e75ecf2bd9dd
equal deleted inserted replaced
1371:3e5248c82ff2 1372:78a9250e52de
64 64
65 @param server server name of the certificate (string) 65 @param server server name of the certificate (string)
66 @param cert certificate to insert (QSslCertificate) 66 @param cert certificate to insert (QSslCertificate)
67 """ 67 """
68 # step 1: extract the info to be shown 68 # step 1: extract the info to be shown
69 organisation = Utilities.decodeString( 69 organisation = Qt.escape(Utilities.decodeString(
70 cert.subjectInfo(QSslCertificate.Organization)) 70 cert.subjectInfo(QSslCertificate.Organization)))
71 if organisation is None or organisation == "": 71 if organisation is None or organisation == "":
72 organisation = self.trUtf8("(Unknown)") 72 organisation = self.trUtf8("(Unknown)")
73 commonName = Utilities.decodeString( 73 commonName = Qt.escape(Utilities.decodeString(
74 cert.subjectInfo(QSslCertificate.CommonName)) 74 cert.subjectInfo(QSslCertificate.CommonName)))
75 if commonName is None or commonName == "": 75 if commonName is None or commonName == "":
76 commonName = self.trUtf8("(Unknown common name)") 76 commonName = self.trUtf8("(Unknown common name)")
77 expiryDate = cert.expiryDate().toString("yyyy-MM-dd") 77 expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))
78 78
79 # step 2: create the entry 79 # step 2: create the entry
80 items = self.serversCertificatesTree.findItems(organisation, 80 items = self.serversCertificatesTree.findItems(organisation,
81 Qt.MatchFixedString | Qt.MatchCaseSensitive) 81 Qt.MatchFixedString | Qt.MatchCaseSensitive)
82 if len(items) == 0: 82 if len(items) == 0:
246 Private method to create a CA certificate entry. 246 Private method to create a CA certificate entry.
247 247
248 @param cert certificate to insert (QSslCertificate) 248 @param cert certificate to insert (QSslCertificate)
249 """ 249 """
250 # step 1: extract the info to be shown 250 # step 1: extract the info to be shown
251 organisation = Utilities.decodeString( 251 organisation = Qt.escape(Utilities.decodeString(
252 cert.subjectInfo(QSslCertificate.Organization)) 252 cert.subjectInfo(QSslCertificate.Organization)))
253 if organisation is None or organisation == "": 253 if organisation is None or organisation == "":
254 organisation = self.trUtf8("(Unknown)") 254 organisation = self.trUtf8("(Unknown)")
255 commonName = Utilities.decodeString( 255 commonName = Qt.escape(Utilities.decodeString(
256 cert.subjectInfo(QSslCertificate.CommonName)) 256 cert.subjectInfo(QSslCertificate.CommonName)))
257 if commonName is None or commonName == "": 257 if commonName is None or commonName == "":
258 commonName = self.trUtf8("(Unknown common name)") 258 commonName = self.trUtf8("(Unknown common name)")
259 expiryDate = cert.expiryDate().toString("yyyy-MM-dd") 259 expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))
260 260
261 # step 2: create the entry 261 # step 2: create the entry
262 items = self.caCertificatesTree.findItems(organisation, 262 items = self.caCertificatesTree.findItems(organisation,
263 Qt.MatchFixedString | Qt.MatchCaseSensitive) 263 Qt.MatchFixedString | Qt.MatchCaseSensitive)
264 if len(items) == 0: 264 if len(items) == 0:

eric ide

mercurial