diff -r 171caaf2dac2 -r 617a83ed2204 E5Network/E5SslCertificatesDialog.py
--- a/E5Network/E5SslCertificatesDialog.py Sun Apr 26 16:28:00 2015 +0200
+++ b/E5Network/E5SslCertificatesDialog.py Fri May 01 11:27:32 2015 +0200
@@ -25,6 +25,7 @@
import Preferences
import Utilities
import UI.PixmapCache
+import Globals
class E5SslCertificatesDialog(QDialog, Ui_E5SslCertificatesDialog):
@@ -67,7 +68,7 @@
"""
Private slot to populate the server certificates tree.
"""
- certificateDict = Preferences.toDict(
+ certificateDict = Globals.toDict(
Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
for server in certificateDict:
for cert in QSslCertificate.fromData(certificateDict[server]):
@@ -174,7 +175,7 @@
self.serversCertificatesTree.indexOfTopLevelItem(parent))
# delete the certificate from the user certificate store
- certificateDict = Preferences.toDict(
+ certificateDict = Globals.toDict(
Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
if server in certificateDict:
certs = QSslCertificate.fromData(certificateDict[server])
@@ -202,7 +203,7 @@
certs = self.__importCertificate()
if certs:
server = "*"
- certificateDict = Preferences.toDict(
+ certificateDict = Globals.toDict(
Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
if server in certificateDict:
sCerts = QSslCertificate.fromData(certificateDict[server])
@@ -255,7 +256,7 @@
Private method to update the default SSL configuration.
"""
caList = self.__getSystemCaCertificates()
- certificateDict = Preferences.toDict(
+ certificateDict = Globals.toDict(
Preferences.Prefs.settings.value("Ssl/CaCertificatesDict"))
for server in certificateDict:
for cert in QSslCertificate.fromData(certificateDict[server]):
@@ -271,7 +272,7 @@
@return list of system certificates (list of QSslCertificate)
"""
- caList = QSslCertificate.fromData(Preferences.toByteArray(
+ caList = QSslCertificate.fromData(Globals.toByteArray(
Preferences.Prefs.settings.value("Help/SystemCertificates")))
if not caList:
caList = QSslSocket.systemCaCertificates()
