Mercurial Repositories > eric / file diff

--- a/eric7/UI/UserInterface.py	Sat May 22 12:54:57 2021 +0200
+++ b/eric7/UI/UserInterface.py	Sat May 22 16:52:45 2021 +0200
@@ -56,11 +56,11 @@
 
 from Tasks.TasksFile import TasksFile
 
-from E5Network.E5NetworkProxyFactory import (
-    E5NetworkProxyFactory, proxyAuthenticationRequired
+from EricNetwork.EricNetworkProxyFactory import (
+    EricNetworkProxyFactory, proxyAuthenticationRequired
 )
 try:
-    from E5Network.E5SslErrorHandler import E5SslErrorHandler, E5SslErrorState
+    from EricNetwork.EricSslErrorHandler import EricSslErrorHandler, EricSslErrorState
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
@@ -223,7 +223,7 @@
         if Preferences.getUI("UseSystemProxy"):
             QNetworkProxyFactory.setUseSystemConfiguration(True)
         else:
-            self.__proxyFactory = E5NetworkProxyFactory()
+            self.__proxyFactory = EricNetworkProxyFactory()
             QNetworkProxyFactory.setApplicationProxyFactory(
                 self.__proxyFactory)
             QNetworkProxyFactory.setUseSystemConfiguration(False)
@@ -727,7 +727,7 @@
         self.__networkManager.proxyAuthenticationRequired.connect(
             proxyAuthenticationRequired)
         if SSL_AVAILABLE:
-            self.__sslErrorHandler = E5SslErrorHandler(self)
+            self.__sslErrorHandler = EricSslErrorHandler(self)
             self.__networkManager.sslErrors.connect(self.__sslErrors)
         self.__replies = []
         
@@ -6202,7 +6202,7 @@
         if Preferences.getUI("UseSystemProxy"):
             QNetworkProxyFactory.setUseSystemConfiguration(True)
         else:
-            self.__proxyFactory = E5NetworkProxyFactory()
+            self.__proxyFactory = EricNetworkProxyFactory()
             QNetworkProxyFactory.setApplicationProxyFactory(
                 self.__proxyFactory)
             QNetworkProxyFactory.setUseSystemConfiguration(False)
@@ -6353,9 +6353,9 @@
         """
         Private slot to show the certificates management dialog.
         """
-        from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
-        
-        dlg = E5SslCertificatesDialog(self)
+        from EricNetwork.EricSslCertificatesDialog import EricSslCertificatesDialog
+        
+        dlg = EricSslCertificatesDialog(self)
         dlg.exec()
         
     def __clearPrivateData(self):
@@ -7294,7 +7294,7 @@
         @param errors list of SSL errors (list of QSslError)
         """
         ignored = self.__sslErrorHandler.sslErrorsReply(reply, errors)[0]
-        if ignored == E5SslErrorState.NOT_IGNORED:
+        if ignored == EricSslErrorState.NOT_IGNORED:
             self.__downloadCancelled = True
     
     #######################################