Mercurial Repositories > eric / file diff

--- a/eric6/E5Network/E5SslCertificatesInfoWidget.py	Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/E5Network/E5SslCertificatesInfoWidget.py	Sun Sep 01 19:40:53 2019 +0200
@@ -16,7 +16,6 @@
 from .Ui_E5SslCertificatesInfoWidget import Ui_E5SslCertificatesInfoWidget
 
 import Utilities
-from Globals import qVersionTuple
 
 
 class E5SslCertificatesInfoWidget(QWidget, Ui_E5SslCertificatesInfoWidget):
@@ -48,16 +47,10 @@
         self.__chain = certificateChain[:]
         
         for cert in self.__chain:
-            if qVersionTuple() >= (5, 0, 0):
-                name = ", ".join(cert.subjectInfo(QSslCertificate.CommonName))
-            else:
-                name = cert.subjectInfo(QSslCertificate.CommonName)
+            name = ", ".join(cert.subjectInfo(QSslCertificate.CommonName))
             if not name:
-                if qVersionTuple() >= (5, 0, 0):
-                    name = ", ".join(
-                        cert.subjectInfo(QSslCertificate.Organization))
-                else:
-                    name = cert.subjectInfo(QSslCertificate.Organization)
+                name = ", ".join(
+                    cert.subjectInfo(QSslCertificate.Organization))
             if not name:
                 name = cert.serialNumber()
             self.chainComboBox.addItem(name)
@@ -91,41 +84,25 @@
         self.expiredLabel.setStyleSheet(
             "QLabel { color : white; background-color : red; }")
         
-        if qVersionTuple() >= (5, 0, 0):
-            self.subjectCommonNameLabel.setText(self.__certificateString(
-                ", ".join(certificate.subjectInfo(
-                    QSslCertificate.CommonName))))
-            self.subjectOrganizationLabel.setText(self.__certificateString(
-                ", ".join(certificate.subjectInfo(
-                    QSslCertificate.Organization))))
-            self.subjectOrganizationalUnitLabel.setText(
-                self.__certificateString(", ".join(
-                    certificate.subjectInfo(
-                        QSslCertificate.OrganizationalUnitName))))
-            self.issuerCommonNameLabel.setText(self.__certificateString(
-                ", ".join(certificate.issuerInfo(QSslCertificate.CommonName))))
-            self.issuerOrganizationLabel.setText(self.__certificateString(
-                ", ".join(certificate.issuerInfo(
-                    QSslCertificate.Organization))))
-            self.issuerOrganizationalUnitLabel.setText(
-                self.__certificateString(", ".join(
-                    certificate.issuerInfo(
-                        QSslCertificate.OrganizationalUnitName))))
-        else:
-            self.subjectCommonNameLabel.setText(self.__certificateString(
-                certificate.subjectInfo(QSslCertificate.CommonName)))
-            self.subjectOrganizationLabel.setText(self.__certificateString(
-                certificate.subjectInfo(QSslCertificate.Organization)))
-            self.subjectOrganizationalUnitLabel.setText(
-                self.__certificateString(certificate.subjectInfo(
-                    QSslCertificate.OrganizationalUnitName)))
-            self.issuerCommonNameLabel.setText(self.__certificateString(
-                certificate.issuerInfo(QSslCertificate.CommonName)))
-            self.issuerOrganizationLabel.setText(self.__certificateString(
-                certificate.issuerInfo(QSslCertificate.Organization)))
-            self.issuerOrganizationalUnitLabel.setText(
-                self.__certificateString(certificate.issuerInfo(
-                    QSslCertificate.OrganizationalUnitName)))
+        self.subjectCommonNameLabel.setText(self.__certificateString(
+            ", ".join(certificate.subjectInfo(
+                QSslCertificate.CommonName))))
+        self.subjectOrganizationLabel.setText(self.__certificateString(
+            ", ".join(certificate.subjectInfo(
+                QSslCertificate.Organization))))
+        self.subjectOrganizationalUnitLabel.setText(
+            self.__certificateString(", ".join(
+                certificate.subjectInfo(
+                    QSslCertificate.OrganizationalUnitName))))
+        self.issuerCommonNameLabel.setText(self.__certificateString(
+            ", ".join(certificate.issuerInfo(QSslCertificate.CommonName))))
+        self.issuerOrganizationLabel.setText(self.__certificateString(
+            ", ".join(certificate.issuerInfo(
+                QSslCertificate.Organization))))
+        self.issuerOrganizationalUnitLabel.setText(
+            self.__certificateString(", ".join(
+                certificate.issuerInfo(
+                    QSslCertificate.OrganizationalUnitName))))
         self.serialNumberLabel.setText(self.__serialNumber(certificate))
         self.effectiveLabel.setText(
             certificate.effectiveDate().toString("yyyy-MM-dd"))
@@ -138,8 +115,7 @@
             str(certificate.digest(QCryptographicHash.Md5).toHex(),
                 encoding="ascii")))
         
-        if (qVersionTuple() >= (5, 0, 0) and certificate.isBlacklisted()) or \
-           (qVersionTuple() < (5, 0, 0) and not certificate.isValid()):
+        if certificate.isBlacklisted():
             # something is wrong; indicate it to the user
             if self.__hasExpired(certificate.effectiveDate(),
                                  certificate.expiryDate()):