diff -r 331569d44b19 -r 684261ef2165 eric6/E5Network/E5SslCertificateSelectionDialog.py
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py Sun Sep 01 17:44:33 2019 +0200
+++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py Sun Sep 01 19:40:53 2019 +0200
@@ -21,7 +21,6 @@
import Utilities
import UI.PixmapCache
-from Globals import qVersionTuple
class E5SslCertificateSelectionDialog(QDialog,
@@ -74,16 +73,10 @@
@type QSslCertificate
"""
# step 1: extract the info to be shown
- if qVersionTuple() >= (5, 0, 0):
- organisation = Utilities.decodeString(
- ", ".join(cert.subjectInfo(QSslCertificate.Organization)))
- commonName = Utilities.decodeString(
- ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))
- else:
- organisation = Utilities.decodeString(
- cert.subjectInfo(QSslCertificate.Organization))
- commonName = Utilities.decodeString(
- cert.subjectInfo(QSslCertificate.CommonName))
+ organisation = Utilities.decodeString(
+ ", ".join(cert.subjectInfo(QSslCertificate.Organization)))
+ commonName = Utilities.decodeString(
+ ", ".join(cert.subjectInfo(QSslCertificate.CommonName)))
if organisation is None or organisation == "":
organisation = self.tr("(Unknown)")
if commonName is None or commonName == "":
