Mercurial Repositories > eric / file comparison
comparison: E5Network/E5NetworkProxyFactory.py
E5Network/E5NetworkProxyFactory.py
- changeset 3022
- 57179e4cdadd
- parent 3020
- 542e97d4ecb3
- child 3058
- 0a02c433f52d
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3021:801289962f4e | 3022:57179e4cdadd |
|---|---|
| 45 Module slot to handle a proxy authentication request. | 45 Module slot to handle a proxy authentication request. |
| 46 | 46 |
| 47 @param proxy reference to the proxy object (QNetworkProxy) | 47 @param proxy reference to the proxy object (QNetworkProxy) |
| 48 @param auth reference to the authenticator object (QAuthenticator) | 48 @param auth reference to the authenticator object (QAuthenticator) |
| 49 """ | 49 """ |
| 50 info = QCoreApplication.translate("E5NetworkProxyFactory", | 50 info = QCoreApplication.translate( |
| 51 "E5NetworkProxyFactory", | |
| 51 "<b>Connect to proxy '{0}' using:</b>")\ | 52 "<b>Connect to proxy '{0}' using:</b>")\ |
| 52 .format(Utilities.html_encode(proxy.hostName())) | 53 .format(Utilities.html_encode(proxy.hostName())) |
| 53 | 54 |
| 54 from UI.AuthenticationDialog import AuthenticationDialog | 55 from UI.AuthenticationDialog import AuthenticationDialog |
| 55 dlg = AuthenticationDialog(info, proxy.user(), True) | 56 dlg = AuthenticationDialog(info, proxy.user(), True) |
| 133 protocolKey = query.protocolTag().capitalize() | 134 protocolKey = query.protocolTag().capitalize() |
| 134 host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) | 135 host = Preferences.getUI("ProxyHost/{0}".format(protocolKey)) |
| 135 if not host: | 136 if not host: |
| 136 E5MessageBox.critical( | 137 E5MessageBox.critical( |
| 137 None, | 138 None, |
| 138 QCoreApplication.translate("E5NetworkProxyFactory", | 139 QCoreApplication.translate( |
| 140 "E5NetworkProxyFactory", | |
| 139 "Proxy Configuration Error"), | 141 "Proxy Configuration Error"), |
| 140 QCoreApplication.translate("E5NetworkProxyFactory", | 142 QCoreApplication.translate( |
| 143 "E5NetworkProxyFactory", | |
| 141 """Proxy usage was activated""" | 144 """Proxy usage was activated""" |
| 142 """ but no proxy host for protocol""" | 145 """ but no proxy host for protocol""" |
| 143 """ '{0}' configured.""").format(protocolKey)) | 146 """ '{0}' configured.""").format(protocolKey)) |
| 144 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] | 147 return [QNetworkProxy(QNetworkProxy.DefaultProxy)] |
| 145 else: | 148 else: |
| 148 proxyType = QNetworkProxy.FtpCachingProxy | 151 proxyType = QNetworkProxy.FtpCachingProxy |
| 149 elif query.protocolTag() == "https": | 152 elif query.protocolTag() == "https": |
| 150 proxyType = QNetworkProxy.HttpCachingProxy | 153 proxyType = QNetworkProxy.HttpCachingProxy |
| 151 else: | 154 else: |
| 152 proxyType = QNetworkProxy.HttpProxy | 155 proxyType = QNetworkProxy.HttpProxy |
| 153 proxy = QNetworkProxy(proxyType, host, | 156 proxy = QNetworkProxy( |
| 157 proxyType, host, | |
| 154 Preferences.getUI("ProxyPort/" + protocolKey), | 158 Preferences.getUI("ProxyPort/" + protocolKey), |
| 155 Preferences.getUI("ProxyUser/" + protocolKey), | 159 Preferences.getUI("ProxyUser/" + protocolKey), |
| 156 Preferences.getUI("ProxyPassword/" + protocolKey)) | 160 Preferences.getUI("ProxyPassword/" + protocolKey)) |
| 157 else: | 161 else: |
| 158 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) | 162 proxy = QNetworkProxy(QNetworkProxy.DefaultProxy) |
