Mercurial Repositories > eric / file diff

--- a/Helpviewer/SslCertificatesDialog.py	Sun Sep 30 17:16:04 2012 +0200
+++ b/Helpviewer/SslCertificatesDialog.py	Sun Sep 30 17:23:16 2012 +0200
@@ -69,20 +69,20 @@
         """
         # step 1: extract the info to be shown
         if qVersion() >= "5.0.0":
-            organisation = Qt.escape(Utilities.decodeString(
+            organisation = Utilities.html_encode(Utilities.decodeString(
                 ", ".join(cert.subjectInfo(QSslCertificate.Organization))))
-            commonName = Qt.escape(Utilities.decodeString(
+            commonName = Utilities.html_encode(Utilities.decodeString(
                 ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))
         else:
-            organisation = Qt.escape(Utilities.decodeString(
+            organisation = Utilities.html_encode(Utilities.decodeString(
                 cert.subjectInfo(QSslCertificate.Organization)))
-            commonName = Qt.escape(Utilities.decodeString(
+            commonName = Utilities.html_encode(Utilities.decodeString(
                 cert.subjectInfo(QSslCertificate.CommonName)))
         if organisation is None or organisation == "":
             organisation = self.trUtf8("(Unknown)")
         if commonName is None or commonName == "":
             commonName = self.trUtf8("(Unknown common name)")
-        expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))
+        expiryDate = Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd"))
         
         # step 2: create the entry
         items = self.serversCertificatesTree.findItems(organisation,
@@ -261,20 +261,20 @@
         """
         # step 1: extract the info to be shown
         if qVersion() >= "5.0.0":
-            organisation = Qt.escape(Utilities.decodeString(
+            organisation = Utilities.html_encode(Utilities.decodeString(
                 ", ".join(cert.subjectInfo(QSslCertificate.Organization))))
-            commonName = Qt.escape(Utilities.decodeString(
+            commonName = Utilities.html_encode(Utilities.decodeString(
                 ", ".join(cert.subjectInfo(QSslCertificate.CommonName))))
         else:
-            organisation = Qt.escape(Utilities.decodeString(
+            organisation = Utilities.html_encode(Utilities.decodeString(
                 cert.subjectInfo(QSslCertificate.Organization)))
-            commonName = Qt.escape(Utilities.decodeString(
+            commonName = Utilities.html_encode(Utilities.decodeString(
                 cert.subjectInfo(QSslCertificate.CommonName)))
         if organisation is None or organisation == "":
             organisation = self.trUtf8("(Unknown)")
         if commonName is None or commonName == "":
             commonName = self.trUtf8("(Unknown common name)")
-        expiryDate = Qt.escape(cert.expiryDate().toString("yyyy-MM-dd"))
+        expiryDate = Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd"))
         
         # step 2: create the entry
         items = self.caCertificatesTree.findItems(organisation,