Change the SSL error handling of the network access handler. 5_0_x

Mon, 15 Nov 2010 19:55:25 +0100

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 15 Nov 2010 19:55:25 +0100
branch
5_0_x
changeset 722
b70941c7f2eb
parent 720
dd67928832ab
child 731
20684eb52d61

Change the SSL error handling of the network access handler.

Helpviewer/Network/NetworkAccessManager.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/Network/NetworkAccessManager.py	Sat Nov 13 19:51:38 2010 +0100
+++ b/Helpviewer/Network/NetworkAccessManager.py	Mon Nov 15 19:55:25 2010 +0100
@@ -13,7 +13,7 @@
 from PyQt4.QtGui import QDialog, QMessageBox
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
 try:
-    from PyQt4.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslSocket
+    from PyQt4.QtNetwork import QSslCertificate, QSslConfiguration, QSslSocket
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
@@ -283,14 +283,8 @@
             .format(cert.issuerInfo(QSslCertificate.CommonName))
         
         result += self.trUtf8("<br/>Not valid before: {0}<br/>Valid Until: {1}")\
-            .format(cert.effectiveDate().toString(Qt.ISODate), 
-                    cert.expiryDate().toString(Qt.ISODate))
-        
-        names = cert.alternateSubjectNames()
-        tmpList = names.get(QSsl.DnsEntry, [])
-        if tmpList:
-            result += self.trUtf8("<br/>Alternate Names:<ul><li>{0}</li></ul>")\
-                .format("</li><li>".join(tmpList))
+            .format(cert.effectiveDate().toString("yyyy-MM-dd"), 
+                    cert.expiryDate().toString("yyyy-MM-dd"))
         
         result += "</p>"
         

eric ide

mercurial