Mercurial Repositories > eric / file comparison
comparison: src/eric7/WebBrowser/Network/NetworkManager.py
src/eric7/WebBrowser/Network/NetworkManager.py
- branch
- eric7
- changeset 9413
- 80c06d472826
- parent 9221
- bf71ee032bb4
- child 9470
- 34f2493c1d3f
equal
deleted
inserted
replaced
| 9412:45e7bb09c120 | 9413:80c06d472826 |
|---|---|
| 17 QNetworkProxy, | 17 QNetworkProxy, |
| 18 QNetworkProxyFactory, | 18 QNetworkProxyFactory, |
| 19 QNetworkRequest, | 19 QNetworkRequest, |
| 20 ) | 20 ) |
| 21 | 21 |
| 22 from EricWidgets import EricMessageBox | 22 from eric7.EricWidgets import EricMessageBox |
| 23 from EricWidgets.EricApplication import ericApp | 23 from eric7.EricWidgets.EricApplication import ericApp |
| 24 | 24 |
| 25 from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired | 25 from eric7.EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired |
| 26 | 26 |
| 27 try: | 27 try: |
| 28 from EricNetwork.EricSslErrorHandler import EricSslErrorHandler | 28 from eric7.EricNetwork.EricSslErrorHandler import EricSslErrorHandler |
| 29 | 29 |
| 30 SSL_AVAILABLE = True | 30 SSL_AVAILABLE = True |
| 31 except ImportError: | 31 except ImportError: |
| 32 SSL_AVAILABLE = False | 32 SSL_AVAILABLE = False |
| 33 | 33 |
| 34 from WebBrowser.WebBrowserWindow import WebBrowserWindow | 34 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 35 from .NetworkUrlInterceptor import NetworkUrlInterceptor | 35 from .NetworkUrlInterceptor import NetworkUrlInterceptor |
| 36 from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl | 36 from ..Tools.WebBrowserTools import getHtmlPage, pixmapToDataUrl |
| 37 | 37 |
| 38 from Utilities.AutoSaver import AutoSaver | 38 from eric7.Utilities.AutoSaver import AutoSaver |
| 39 import Preferences | 39 from eric7 import Preferences |
| 40 | 40 |
| 41 | 41 |
| 42 class NetworkManager(QNetworkAccessManager): | 42 class NetworkManager(QNetworkAccessManager): |
| 43 """ | 43 """ |
| 44 Class implementing a network manager. | 44 Class implementing a network manager. |
| 55 @param engine reference to the help engine (QHelpEngine) | 55 @param engine reference to the help engine (QHelpEngine) |
| 56 @param parent reference to the parent object (QObject) | 56 @param parent reference to the parent object (QObject) |
| 57 """ | 57 """ |
| 58 super().__init__(parent) | 58 super().__init__(parent) |
| 59 | 59 |
| 60 from EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory | 60 from eric7.EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory |
| 61 | 61 |
| 62 self.__proxyFactory = EricNetworkProxyFactory() | 62 self.__proxyFactory = EricNetworkProxyFactory() |
| 63 if Preferences.getUI("UseSystemProxy"): | 63 if Preferences.getUI("UseSystemProxy"): |
| 64 QNetworkProxyFactory.setUseSystemConfiguration(True) | 64 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 65 else: | 65 else: |
| 112 Private slot to save the permanent SSL error exceptions. | 112 Private slot to save the permanent SSL error exceptions. |
| 113 """ | 113 """ |
| 114 if not self.__loaded: | 114 if not self.__loaded: |
| 115 return | 115 return |
| 116 | 116 |
| 117 from WebBrowser.WebBrowserWindow import WebBrowserWindow | 117 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 118 | 118 |
| 119 if not WebBrowserWindow.isPrivate(): | 119 if not WebBrowserWindow.isPrivate(): |
| 120 dbString = json.dumps(self.__permanentlyIgnoredSslErrors) | 120 dbString = json.dumps(self.__permanentlyIgnoredSslErrors) |
| 121 Preferences.setWebBrowser("SslExceptionsDB", dbString) | 121 Preferences.setWebBrowser("SslExceptionsDB", dbString) |
| 122 | 122 |
| 293 ) | 293 ) |
| 294 if realm | 294 if realm |
| 295 else self.tr("<b>Enter username and password for '{0}'</b>").format(urlRoot) | 295 else self.tr("<b>Enter username and password for '{0}'</b>").format(urlRoot) |
| 296 ) | 296 ) |
| 297 | 297 |
| 298 from UI.AuthenticationDialog import AuthenticationDialog | 298 from eric7.UI.AuthenticationDialog import AuthenticationDialog |
| 299 import WebBrowser.WebBrowserWindow | 299 from eric7.WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 300 | 300 |
| 301 dlg = AuthenticationDialog( | 301 dlg = AuthenticationDialog( |
| 302 info, | 302 info, |
| 303 auth.user(), | 303 auth.user(), |
| 304 Preferences.getUser("SavePasswords"), | 304 Preferences.getUser("SavePasswords"), |
| 306 ) | 306 ) |
| 307 if Preferences.getUser("SavePasswords"): | 307 if Preferences.getUser("SavePasswords"): |
| 308 ( | 308 ( |
| 309 username, | 309 username, |
| 310 password, | 310 password, |
| 311 ) = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager().getLogin( | 311 ) = WebBrowserWindow.passwordManager().getLogin(url, realm) |
| 312 url, realm | |
| 313 ) | |
| 314 if username: | 312 if username: |
| 315 dlg.setData(username, password) | 313 dlg.setData(username, password) |
| 316 if dlg.exec() == QDialog.DialogCode.Accepted: | 314 if dlg.exec() == QDialog.DialogCode.Accepted: |
| 317 username, password = dlg.getData() | 315 username, password = dlg.getData() |
| 318 auth.setUser(username) | 316 auth.setUser(username) |
| 319 auth.setPassword(password) | 317 auth.setPassword(password) |
| 320 if Preferences.getUser("SavePasswords") and dlg.shallSave(): | 318 if Preferences.getUser("SavePasswords") and dlg.shallSave(): |
| 321 pm = WebBrowser.WebBrowserWindow.WebBrowserWindow.passwordManager() | 319 pm = WebBrowserWindow.passwordManager() |
| 322 pm.setLogin(url, realm, username, password) | 320 pm.setLogin(url, realm, username, password) |
| 323 else: | 321 else: |
| 324 if page is not None: | 322 if page is not None: |
| 325 self.__showAuthenticationErrorPage(page, url) | 323 self.__showAuthenticationErrorPage(page, url) |
| 326 | 324 |
| 379 | 377 |
| 380 def languagesChanged(self): | 378 def languagesChanged(self): |
| 381 """ | 379 """ |
| 382 Public slot to (re-)load the list of accepted languages. | 380 Public slot to (re-)load the list of accepted languages. |
| 383 """ | 381 """ |
| 384 from WebBrowser.WebBrowserLanguagesDialog import WebBrowserLanguagesDialog | 382 from eric7.WebBrowser.WebBrowserLanguagesDialog import WebBrowserLanguagesDialog |
| 385 | 383 |
| 386 languages = Preferences.toList( | 384 languages = Preferences.toList( |
| 387 Preferences.getSettings().value( | 385 Preferences.getSettings().value( |
| 388 "WebBrowser/AcceptLanguages", | 386 "WebBrowser/AcceptLanguages", |
| 389 WebBrowserLanguagesDialog.defaultAcceptLanguages(), | 387 WebBrowserLanguagesDialog.defaultAcceptLanguages(), |
