diff -r 7ce719013078 -r 36e9f388958b E5Network/E5SslCertificatesDialog.py
--- a/E5Network/E5SslCertificatesDialog.py Sat Oct 19 13:03:39 2013 +0200
+++ b/E5Network/E5SslCertificatesDialog.py Sat Oct 19 14:05:26 2013 +0200
@@ -66,7 +66,7 @@
Private slot to populate the server certificates tree.
"""
certificateDict = Preferences.toDict(
- Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+ Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
for server in certificateDict:
for cert in QSslCertificate.fromData(certificateDict[server]):
self.__createServerCertificateEntry(server, cert)
@@ -157,7 +157,7 @@
""" normal security checks will be reinstantiated"""
""" and the server has to present a valid"""
""" certificate.</p>""")
- .format(itm.text(0)))
+ .format(itm.text(0)))
if res:
server = itm.text(1)
cert = self.serversCertificatesTree.currentItem().data(
@@ -173,7 +173,7 @@
# delete the certificate from the user certificate store
certificateDict = Preferences.toDict(
- Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+ Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
if server in certificateDict:
certs = QSslCertificate.fromData(certificateDict[server])
if cert in certs:
@@ -222,7 +222,7 @@
self.trUtf8(
"""<p>The certificate <b>{0}</b> already exists."""
""" Skipping.</p>""")
- .format(Utilities.decodeString(commonStr)))
+ .format(Utilities.decodeString(commonStr)))
else:
pems.append(cert.toPem() + '\n')
if server not in certificateDict:
@@ -254,7 +254,7 @@
"""
caList = self.__getSystemCaCertificates()
certificateDict = Preferences.toDict(
- Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
+ Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
for server in certificateDict:
for cert in QSslCertificate.fromData(certificateDict[server]):
if cert not in caList:
@@ -365,7 +365,7 @@
"""<p>{0}</p>"""
"""<p>If the CA certificate is deleted, the browser"""
""" will not trust any certificate issued by this CA.</p>""")
- .format(itm.text(0)))
+ .format(itm.text(0)))
if res:
cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
@@ -412,7 +412,7 @@
self.trUtf8(
"""<p>The certificate <b>{0}</b> already exists."""
""" Skipping.</p>""")
- .format(Utilities.decodeString(commonStr)))
+ .format(Utilities.decodeString(commonStr)))
else:
caCerts.append(cert)
@@ -478,7 +478,7 @@
self.trUtf8(
"""<p>The certificate could not be written"""
""" to file <b>{0}</b></p><p>Error: {1}</p>""")
- .format(fname, f.errorString()))
+ .format(fname, f.errorString()))
return
if fname.endswith(".pem"):
@@ -510,7 +510,7 @@
self.trUtf8(
"""<p>The certificate could not be read from file"""
""" <b>{0}</b></p><p>Error: {1}</p>""")
- .format(fname, f.errorString()))
+ .format(fname, f.errorString()))
return []
crt = f.readAll()
