Mercurial Repositories > eric / file diff

--- a/Helpviewer/Network/NetworkAccessManager.py	Sun Sep 30 17:16:04 2012 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sun Sep 30 17:23:16 2012 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import pyqtSignal, QByteArray, Qt, qVersion
+from PyQt4.QtCore import pyqtSignal, QByteArray, qVersion
 from PyQt4.QtGui import QDialog
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
@@ -318,32 +318,32 @@
         
         if qVersion() >= "5.0.0":
             result += self.trUtf8("Name: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))))
             
             result += self.trUtf8("<br/>Organization: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     ", ".join(cert.subjectInfo(QSslCertificate.Organization)))))
             
             result += self.trUtf8("<br/>Issuer: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     ", ".join(cert.issuerInfo(QSslCertificate.CommonName)))))
         else:
             result += self.trUtf8("Name: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     cert.subjectInfo(QSslCertificate.CommonName))))
             
             result += self.trUtf8("<br/>Organization: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     cert.subjectInfo(QSslCertificate.Organization))))
             
             result += self.trUtf8("<br/>Issuer: {0}")\
-                .format(Qt.escape(Utilities.decodeString(
+                .format(Utilities.html_encode(Utilities.decodeString(
                     cert.issuerInfo(QSslCertificate.CommonName))))
         
         result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\
-            .format(Qt.escape(cert.effectiveDate().toString("yyyy-MM-dd")),
-                    Qt.escape(cert.expiryDate().toString("yyyy-MM-dd")))
+            .format(Utilities.html_encode(cert.effectiveDate().toString("yyyy-MM-dd")),
+                    Utilities.html_encode(cert.expiryDate().toString("yyyy-MM-dd")))
         
         result += "</p>"