Mercurial Repositories > eric / file diff

--- a/src/eric7/WebBrowser/Network/NetworkManager.py	Tue Oct 18 16:05:20 2022 +0200
+++ b/src/eric7/WebBrowser/Network/NetworkManager.py	Tue Oct 18 16:06:21 2022 +0200
@@ -19,24 +19,24 @@
     QNetworkRequest,
 )
 
-from EricWidgets import EricMessageBox
-from EricWidgets.EricApplication import ericApp
+from eric7.EricWidgets import EricMessageBox
+from eric7.EricWidgets.EricApplication import ericApp
 
-from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
+from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired
 
 try:
-    from EricNetwork.EricSslErrorHandler import EricSslErrorHandler
+    from eric7.EricNetwork.EricSslErrorHandler import EricSslErrorHandler
 
     SSL_AVAILABLE = True
 except ImportError:
     SSL_AVAILABLE = False
 
-from WebBrowser.WebBrowserWindow import WebBrowserWindow
+from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 from .NetworkUrlInterceptor import NetworkUrlInterceptor
 from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl
 
-from Utilities.AutoSaver import AutoSaver
-import Preferences
+from eric7.Utilities.AutoSaver import AutoSaver
+from eric7 import Preferences
 
 
 class NetworkManager(QNetworkAccessManager):
@@ -57,7 +57,7 @@
         """
         super().__init__(parent)
 
-        from EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory
+        from eric7.EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory
 
         self.__proxyFactory = EricNetworkProxyFactory()
         if Preferences.getUI("UseSystemProxy"):
@@ -114,7 +114,7 @@
         if not self.__loaded:
             return
 
-        from WebBrowser.WebBrowserWindow import WebBrowserWindow
+        from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
         if not WebBrowserWindow.isPrivate():
             dbString = json.dumps(self.__permanentlyIgnoredSslErrors)
@@ -295,8 +295,8 @@
             else self.tr("<b>Enter username and password for '{0}'</b>").format(urlRoot)
         )
 
-        from UI.AuthenticationDialog import AuthenticationDialog
-        import WebBrowser.WebBrowserWindow
+        from eric7.UI.AuthenticationDialog import AuthenticationDialog
+        from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow
 
         dlg = AuthenticationDialog(
             info,
@@ -308,9 +308,7 @@
             (
                 username,
                 password,
-            ) = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager().getLogin(
-                url, realm
-            )
+            ) = WebBrowserWindow.passwordManager().getLogin(url, realm)
             if username:
                 dlg.setData(username, password)
         if dlg.exec() == QDialog.DialogCode.Accepted:
@@ -318,7 +316,7 @@
             auth.setUser(username)
             auth.setPassword(password)
             if Preferences.getUser("SavePasswords") and dlg.shallSave():
-                pm = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager()
+                pm = WebBrowserWindow.passwordManager()
                 pm.setLogin(url, realm, username, password)
         else:
             if page is not None:
@@ -381,7 +379,7 @@
         """
         Public slot to (re-)load the list of accepted languages.
         """
-        from WebBrowser.WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
+        from eric7.WebBrowser.WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
 
         languages = Preferences.toList(
             Preferences.getSettings().value(