diff -r 0a02c433f52d -r 5883ce99ee12 E5Network/E5SslCertificatesDialog.py
--- a/E5Network/E5SslCertificatesDialog.py Fri Nov 01 15:48:48 2013 +0100
+++ b/E5Network/E5SslCertificatesDialog.py Sun Nov 03 15:58:22 2013 +0100
@@ -68,7 +68,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)
@@ -158,8 +158,8 @@
"""<p>If the server certificate is deleted, the"""
""" normal security checks will be reinstantiated"""
""" and the server has to present a valid"""
- """ certificate.</p>""")\
- .format(itm.text(0)))
+ """ certificate.</p>""")
+ .format(itm.text(0)))
if res:
server = itm.text(1)
cert = self.serversCertificatesTree.currentItem().data(
@@ -175,7 +175,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:
@@ -224,7 +224,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:
@@ -256,7 +256,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:
@@ -366,8 +366,8 @@
"""<p>Shall the CA certificate really be deleted?</p>"""
"""<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)))
+ """ will not trust any certificate issued by this CA.</p>""")
+ .format(itm.text(0)))
if res:
cert = self.caCertificatesTree.currentItem().data(0, self.CertRole)
@@ -414,7 +414,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)
@@ -480,7 +480,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"):
@@ -512,7 +512,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()
