Mercurial Repositories > eric / file comparison
comparison: eric7/WebBrowser/Network/NetworkManager.py
eric7/WebBrowser/Network/NetworkManager.py
- branch
- eric7
- changeset 8354
- 12ebd3934fef
- parent 8318
- 962bce857696
- child 8356
- 68ec9c3d4de5
equal
deleted
inserted
replaced
| 8353:799196d0b05d | 8354:12ebd3934fef |
|---|---|
| 17 ) | 17 ) |
| 18 | 18 |
| 19 from E5Gui import E5MessageBox | 19 from E5Gui import E5MessageBox |
| 20 from E5Gui.E5Application import e5App | 20 from E5Gui.E5Application import e5App |
| 21 | 21 |
| 22 from E5Network.E5NetworkProxyFactory import proxyAuthenticationRequired | 22 from EricNetwork.EricNetworkProxyFactory import proxyAuthenticationRequired |
| 23 try: | 23 try: |
| 24 from E5Network.E5SslErrorHandler import E5SslErrorHandler | 24 from EricNetwork.EricSslErrorHandler import EricSslErrorHandler |
| 25 SSL_AVAILABLE = True | 25 SSL_AVAILABLE = True |
| 26 except ImportError: | 26 except ImportError: |
| 27 SSL_AVAILABLE = False | 27 SSL_AVAILABLE = False |
| 28 | 28 |
| 29 from WebBrowser.WebBrowserWindow import WebBrowserWindow | 29 from WebBrowser.WebBrowserWindow import WebBrowserWindow |
| 49 @param engine reference to the help engine (QHelpEngine) | 49 @param engine reference to the help engine (QHelpEngine) |
| 50 @param parent reference to the parent object (QObject) | 50 @param parent reference to the parent object (QObject) |
| 51 """ | 51 """ |
| 52 super().__init__(parent) | 52 super().__init__(parent) |
| 53 | 53 |
| 54 from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory | 54 from EricNetwork.EricNetworkProxyFactory import EricNetworkProxyFactory |
| 55 | 55 |
| 56 self.__proxyFactory = E5NetworkProxyFactory() | 56 self.__proxyFactory = EricNetworkProxyFactory() |
| 57 if Preferences.getUI("UseSystemProxy"): | 57 if Preferences.getUI("UseSystemProxy"): |
| 58 QNetworkProxyFactory.setUseSystemConfiguration(True) | 58 QNetworkProxyFactory.setUseSystemConfiguration(True) |
| 59 else: | 59 else: |
| 60 QNetworkProxyFactory.setApplicationProxyFactory( | 60 QNetworkProxyFactory.setApplicationProxyFactory( |
| 61 self.__proxyFactory) | 61 self.__proxyFactory) |
| 62 QNetworkProxyFactory.setUseSystemConfiguration(False) | 62 QNetworkProxyFactory.setUseSystemConfiguration(False) |
| 63 | 63 |
| 64 self.languagesChanged() | 64 self.languagesChanged() |
| 65 | 65 |
| 66 if SSL_AVAILABLE: | 66 if SSL_AVAILABLE: |
| 67 self.__sslErrorHandler = E5SslErrorHandler(self) | 67 self.__sslErrorHandler = EricSslErrorHandler(self) |
| 68 self.sslErrors.connect(self.__sslErrorHandlingSlot) | 68 self.sslErrors.connect(self.__sslErrorHandlingSlot) |
| 69 | 69 |
| 70 self.__temporarilyIgnoredSslErrors = {} | 70 self.__temporarilyIgnoredSslErrors = {} |
| 71 self.__permanentlyIgnoredSslErrors = {} | 71 self.__permanentlyIgnoredSslErrors = {} |
| 72 # dictionaries of permanently and temporarily ignored SSL errors | 72 # dictionaries of permanently and temporarily ignored SSL errors |
