diff -r 331569d44b19 -r 684261ef2165 eric6/E5Network/E5SslErrorHandler.py
--- a/eric6/E5Network/E5SslErrorHandler.py Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/E5Network/E5SslErrorHandler.py Sun Sep 01 19:40:53 2019 +0200
@@ -20,7 +20,6 @@
import Preferences
import Utilities
import Globals
-from Globals import qVersionTuple
class E5SslErrorHandler(QObject):
@@ -209,32 +208,18 @@
"""
result = "<p>"
- if qVersionTuple() >= (5, 0, 0):
- result += self.tr("Name: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))))
-
- result += self.tr("<br/>Organization: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- ", ".join(cert.subjectInfo(
- QSslCertificate.Organization)))))
-
- result += self.tr("<br/>Issuer: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- ", ".join(cert.issuerInfo(QSslCertificate.CommonName)))))
- else:
- result += self.tr("Name: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- cert.subjectInfo(QSslCertificate.CommonName))))
-
- result += self.tr("<br/>Organization: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- cert.subjectInfo(QSslCertificate.Organization))))
-
- result += self.tr("<br/>Issuer: {0}")\
- .format(Utilities.html_encode(Utilities.decodeString(
- cert.issuerInfo(QSslCertificate.CommonName))))
+ result += self.tr("Name: {0}")\
+ .format(Utilities.html_encode(Utilities.decodeString(
+ ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))))
+ result += self.tr("<br/>Organization: {0}")\
+ .format(Utilities.html_encode(Utilities.decodeString(
+ ", ".join(cert.subjectInfo(
+ QSslCertificate.Organization)))))
+
+ result += self.tr("<br/>Issuer: {0}")\
+ .format(Utilities.html_encode(Utilities.decodeString(
+ ", ".join(cert.issuerInfo(QSslCertificate.CommonName)))))
result += self.tr(
"<br/>Not valid before: {0}<br/>Valid Until: {1}")\
.format(Utilities.html_encode(
