eric: comparison E5Network/E5SslCertificatesDialog.py

-:7efa8b8b6903
+:583beaf0b4b8
 """
 Module implementing a dialog to show and edit all certificates.
 """
-from PyQt4.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, QIODevice, \
+from PyQt4.QtCore import pyqtSlot, Qt, QByteArray, QFile, QFileInfo, \
-qVersion
+QIODevice, qVersion
 from PyQt4.QtGui import QDialog, QTreeWidgetItem
 try:
-from PyQt4.QtNetwork import QSslCertificate, QSslSocket, QSslConfiguration, QSsl
+from PyQt4.QtNetwork import QSslCertificate, QSslSocket, \
+QSslConfiguration, QSsl
 except ImportError:
 pass
 from E5Gui import E5MessageBox, E5FileDialog
 @param parent reference to the parent widget (QWidget)
 """
 super().__init__(parent)
 self.setupUi(self)
-self.serversViewButton.setIcon(UI.PixmapCache.getIcon("certificates.png"))
+self.serversViewButton.setIcon(
-self.serversDeleteButton.setIcon(UI.PixmapCache.getIcon("certificateDelete.png"))
+UI.PixmapCache.getIcon("certificates.png"))
-self.serversExportButton.setIcon(UI.PixmapCache.getIcon("certificateExport.png"))
+self.serversDeleteButton.setIcon(
-self.serversImportButton.setIcon(UI.PixmapCache.getIcon("certificateImport.png"))
+UI.PixmapCache.getIcon("certificateDelete.png"))
+self.serversExportButton.setIcon(
-self.caViewButton.setIcon(UI.PixmapCache.getIcon("certificates.png"))
+UI.PixmapCache.getIcon("certificateExport.png"))
-self.caDeleteButton.setIcon(UI.PixmapCache.getIcon("certificateDelete.png"))
+self.serversImportButton.setIcon(
-self.caExportButton.setIcon(UI.PixmapCache.getIcon("certificateExport.png"))
+UI.PixmapCache.getIcon("certificateImport.png"))
-self.caImportButton.setIcon(UI.PixmapCache.getIcon("certificateImport.png"))
+self.caViewButton.setIcon(
+UI.PixmapCache.getIcon("certificates.png"))
+self.caDeleteButton.setIcon(
+UI.PixmapCache.getIcon("certificateDelete.png"))
+self.caExportButton.setIcon(
+UI.PixmapCache.getIcon("certificateExport.png"))
+self.caImportButton.setIcon(
+UI.PixmapCache.getIcon("certificateImport.png"))
 self.__populateServerCertificatesTree()
 self.__populateCaCertificatesTree()
 def __populateServerCertificatesTree(self):
 # step 2: create the entry
 items = self.serversCertificatesTree.findItems(organisation,
 Qt.MatchFixedString | Qt.MatchCaseSensitive)
 if len(items) == 0:
-parent = QTreeWidgetItem(self.serversCertificatesTree, [organisation])
+parent = QTreeWidgetItem(
+self.serversCertificatesTree, [organisation])
 else:
 parent = items[0]
 itm = QTreeWidgetItem(parent, [commonName, server, expiryDate])
 itm.setData(0, self.CertRole, cert.toPem())
 def on_serversViewButton_clicked(self):
 """
 Private slot to show data of the selected server certificate.
 """
 try:
-from E5Network.E5SslCertificatesInfoDialog import E5SslCertificatesInfoDialog
+from E5Network.E5SslCertificatesInfoDialog import \
+E5SslCertificatesInfoDialog
 cert = QSslCertificate.fromData(
-self.serversCertificatesTree.currentItem().data(0, self.CertRole))
+self.serversCertificatesTree.currentItem().data(
+0, self.CertRole))
 dlg = E5SslCertificatesInfoDialog(cert, self)
 dlg.exec_()
 except ImportError:
 pass
 Private slot to delete the selected server certificate.
 """
 itm = self.serversCertificatesTree.currentItem()
 res = E5MessageBox.yesNo(self,
 self.trUtf8("Delete Server Certificate"),
-self.trUtf8("""<p>Shall the server certificate really be deleted?</p>"""
+self.trUtf8("""<p>Shall the server certificate really be"""
-"""<p>{0}</p>"""
+""" deleted?</p><p>{0}</p>"""
-"""<p>If the server certificate is deleted, the normal security"""
+"""<p>If the server certificate is deleted, the"""
-""" checks will be reinstantiated and the server has to"""
+""" normal security checks will be reinstantiated"""
-""" present a valid certificate.</p>""")\
+""" and the server has to present a valid"""
+""" certificate.</p>""")\
 .format(itm.text(0)))
 if res:
 server = itm.text(1)
-cert = self.serversCertificatesTree.currentItem().data(0, self.CertRole)
+cert = self.serversCertificatesTree.currentItem().data(
+0, self.CertRole)
-# delete the selected entry and its parent entry, if it was the only one
+# delete the selected entry and its parent entry,
+# if it was the only one
 parent = itm.parent()
 parent.takeChild(parent.indexOfChild(itm))
 if parent.childCount() == 0:
 self.serversCertificatesTree.takeTopLevelItem(
 self.serversCertificatesTree.indexOfTopLevelItem(parent))
 if cert in sCerts:
 if qVersion() >= "5.0.0":
 commonStr = ", ".join(
 cert.subjectInfo(QSslCertificate.CommonName))
 else:
-commonStr = cert.subjectInfo(QSslCertificate.CommonName)
+commonStr = cert.subjectInfo(
+QSslCertificate.CommonName)
 E5MessageBox.warning(self,
 self.trUtf8("Import Certificate"),
-self.trUtf8("""<p>The certificate <b>{0}</b> already exists."""
+self.trUtf8(
-""" Skipping.</p>""")
+"""<p>The certificate <b>{0}</b> already exists."""
+""" Skipping.</p>""")
 .format(Utilities.decodeString(commonStr)))
 else:
 pems.append(cert.toPem() + '\n')
 if server not in certificateDict:
 certificateDict[server] = QByteArray()
 @pyqtSlot()
 def on_serversExportButton_clicked(self):
 """
 Private slot to export the selected server certificate.
 """
-cert = self.serversCertificatesTree.currentItem().data(0, self.CertRole)
+cert = self.serversCertificatesTree.currentItem().data(
+0, self.CertRole)
 fname = self.serversCertificatesTree.currentItem().text(0)\
 .replace(" ", "").replace("\t", "")
 self.__exportCertificate(fname, cert)
 def __updateDefaultConfiguration(self):
 def on_caViewButton_clicked(self):
 """
 Private slot to show data of the selected CA certificate.
 """
 try:
-from E5Network.E5SslCertificatesInfoDialog import E5SslCertificatesInfoDialog
+from E5Network.E5SslCertificatesInfoDialog import \
+E5SslCertificatesInfoDialog
 cert = QSslCertificate.fromData(
 self.caCertificatesTree.currentItem().data(0, self.CertRole))
 dlg = E5SslCertificatesInfoDialog(cert, self)
 dlg.exec_()
 except ImportError:
 Private slot to delete the selected CA certificate.
 """
 itm = self.caCertificatesTree.currentItem()
 res = E5MessageBox.yesNo(self,
 self.trUtf8("Delete CA Certificate"),
-self.trUtf8("""<p>Shall the CA certificate really be deleted?</p>"""
+self.trUtf8(
-"""<p>{0}</p>"""
+"""<p>Shall the CA certificate really be deleted?</p>"""
-"""<p>If the CA certificate is deleted, the browser"""
+"""<p>{0}</p>"""
-""" will not trust any certificate issued by this CA.</p>""")\
+"""<p>If the CA certificate is deleted, the browser"""
+""" will not trust any certificate issued by this CA.</p>""")\
 .format(itm.text(0)))
 if res:
 cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
-# delete the selected entry and its parent entry, if it was the only one
+# delete the selected entry and its parent entry,
+# if it was the only one
 parent = itm.parent()
 parent.takeChild(parent.indexOfChild(itm))
 if parent.childCount() == 0:
 self.caCertificatesTree.takeTopLevelItem(
 self.caCertificatesTree.indexOfTopLevelItem(parent))
 if cert in caCerts:
 caCerts.remove(cert)
 pems = QByteArray()
 for cert in caCerts:
 pems.append(cert.toPem() + '\n')
-Preferences.Prefs.settings.setValue("Help/SystemCertificates", pems)
+Preferences.Prefs.settings.setValue(
+"Help/SystemCertificates", pems)
 # delete the certificate from the default certificates
 self.__updateDefaultConfiguration()
 @pyqtSlot()
 if cert in caCerts:
 if qVersion() >= "5.0.0":
 commonStr = ", ".join(
 cert.subjectInfo(QSslCertificate.CommonName))
 else:
-commonStr = cert.subjectInfo(QSslCertificate.CommonName)
+commonStr = cert.subjectInfo(
+QSslCertificate.CommonName)
 E5MessageBox.warning(self,
 self.trUtf8("Import Certificate"),
-self.trUtf8("""<p>The certificate <b>{0}</b> already exists."""
+self.trUtf8(
-""" Skipping.</p>""")
+"""<p>The certificate <b>{0}</b> already exists."""
+""" Skipping.</p>""")
 .format(Utilities.decodeString(commonStr)))
 else:
 caCerts.append(cert)
 pems = QByteArray()
 for cert in caCerts:
 pems.append(cert.toPem() + '\n')
-Preferences.Prefs.settings.setValue("Help/SystemCertificates", pems)
+Preferences.Prefs.settings.setValue(
+"Help/SystemCertificates", pems)
 self.caCertificatesTree.clear()
 self.__populateCaCertificatesTree()
 self.__updateDefaultConfiguration()
 f = QFile(fname)
 if not f.open(QIODevice.WriteOnly):
 E5MessageBox.critical(self,
 self.trUtf8("Export Certificate"),
-self.trUtf8("""<p>The certificate could not be written to file"""
+self.trUtf8(
-""" <b>{0}</b></p><p>Error: {1}</p>""")
+"""<p>The certificate could not be written"""
+""" to file <b>{0}</b></p><p>Error: {1}</p>""")
 .format(fname, f.errorString()))
 return
 if fname.endswith(".pem"):
 crt = cert.toPem()
 if fname:
 f = QFile(fname)
 if not f.open(QIODevice.ReadOnly):
 E5MessageBox.critical(self,
 self.trUtf8("Export Certificate"),
-self.trUtf8("""<p>The certificate could not be read from file"""
+self.trUtf8(
-""" <b>{0}</b></p><p>Error: {1}</p>""")
+"""<p>The certificate could not be read from file"""
+""" <b>{0}</b></p><p>Error: {1}</p>""")
 .format(fname, f.errorString()))
 return []
 crt = f.readAll()
 f.close()

Mercurial Repositories > eric / file comparison

comparison: E5Network/E5SslCertificatesDialog.py

E5Network/E5SslCertificatesDialog.py