Mercurial Repositories > eric / file diff

--- a/Helpviewer/Network/NetworkAccessManager.py	Sun Sep 30 13:27:28 2012 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Sun Sep 30 17:04:23 2012 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import pyqtSignal, QByteArray, Qt
+from PyQt4.QtCore import pyqtSignal, QByteArray, Qt, qVersion
 from PyQt4.QtGui import QDialog
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
@@ -316,17 +316,30 @@
         """
         result = "<p>"
         
-        result += self.trUtf8("Name: {0}")\
-            .format(Qt.escape(Utilities.decodeString(
-                cert.subjectInfo(QSslCertificate.CommonName))))
-        
-        result += self.trUtf8("<br/>Organization: {0}")\
-            .format(Qt.escape(Utilities.decodeString(
-                cert.subjectInfo(QSslCertificate.Organization))))
-        
-        result += self.trUtf8("<br/>Issuer: {0}")\
-            .format(Qt.escape(Utilities.decodeString(
-                cert.issuerInfo(QSslCertificate.CommonName))))
+        if qVersion() >= "5.0.0":
+            result += self.trUtf8("Name: {0}")\
+                .format(Qt.escape(Utilities.decodeString(
+                    ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))))
+            
+            result += self.trUtf8("<br/>Organization: {0}")\
+                .format(Qt.escape(Utilities.decodeString(
+                    ", ".join(cert.subjectInfo(QSslCertificate.Organization)))))
+            
+            result += self.trUtf8("<br/>Issuer: {0}")\
+                .format(Qt.escape(Utilities.decodeString(
+                    ", ".join(cert.issuerInfo(QSslCertificate.CommonName)))))
+        else:
+            result += self.trUtf8("Name: {0}")\
+                .format(Qt.escape(Utilities.decodeString(
+                    cert.subjectInfo(QSslCertificate.CommonName))))
+            
+            result += self.trUtf8("<br/>Organization: {0}")\
+                .format(Qt.escape(Utilities.decodeString(
+                    cert.subjectInfo(QSslCertificate.Organization))))
+            
+            result += self.trUtf8("<br/>Issuer: {0}")\
+                .format(Qt.escape(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")),